diff options
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 56 |
1 files changed, 21 insertions, 35 deletions
@@ -6,7 +6,7 @@ # implementation. Use the meta target //third_party:jpeg instead. import("//build/config/sanitizers/sanitizers.gni") -if (current_cpu == "arm") { +if (current_cpu == "arm" || current_cpu == "arm64") { import("//build/config/arm.gni") } @@ -150,36 +150,11 @@ static_library("simd") { sources = [ "simd/x86_64/jsimd.c", ] - } else if (current_cpu == "arm" && arm_version >= 7 && - (arm_use_neon || arm_optionally_use_neon)) { - include_dirs += [ "simd/arm/" ] - sources = [ - "simd/arm/aarch32/jchuff-neon.c", - "simd/arm/aarch32/jsimd.c", - "simd/arm/jccolor-neon.c", - "simd/arm/jcgray-neon.c", - "simd/arm/jcphuff-neon.c", - "simd/arm/jcsample-neon.c", - "simd/arm/jdcolor-neon.c", - "simd/arm/jdmerge-neon.c", - "simd/arm/jdsample-neon.c", - "simd/arm/jfdctfst-neon.c", - "simd/arm/jfdctint-neon.c", - "simd/arm/jidctfst-neon.c", - "simd/arm/jidctint-neon.c", - "simd/arm/jidctred-neon.c", - "simd/arm/jquanti-neon.c", - ] - defines = [ - "NEON_INTRINSICS" - ] - configs -= [ "//build/config/compiler:default_optimization" ] - configs += [ "//build/config/compiler:optimize_speed" ] - } else if (current_cpu == "arm64") { + } else if ((current_cpu == "arm" || current_cpu == "arm64") && + arm_use_neon) { include_dirs += [ "simd/arm/" ] + sources = [ - "simd/arm/aarch64/jchuff-neon.c", - "simd/arm/aarch64/jsimd.c", "simd/arm/jccolor-neon.c", "simd/arm/jcgray-neon.c", "simd/arm/jcphuff-neon.c", @@ -194,9 +169,22 @@ static_library("simd") { "simd/arm/jidctred-neon.c", "simd/arm/jquanti-neon.c", ] + if (current_cpu == "arm") { + sources += [ + "simd/arm/aarch32/jchuff-neon.c", + "simd/arm/aarch32/jsimd.c", + ] + } else if (current_cpu == "arm64"){ + sources += [ + "simd/arm/aarch64/jchuff-neon.c", + "simd/arm/aarch64/jsimd.c", + ] + } + defines = [ "NEON_INTRINSICS" ] + configs -= [ "//build/config/compiler:default_optimization" ] configs += [ "//build/config/compiler:optimize_speed" ] } else { @@ -279,16 +267,14 @@ static_library("libjpeg") { ":libjpeg_headers", ] - # MemorySanitizer doesn't support assembly code, so keep it disabled in - # MSan builds for now. - if (is_msan) { + # MemorySanitizer doesn't support assembly code, so keep it disabled in x86 + # and x64 MSan builds for now. + if (is_msan && (current_cpu == "x86" || current_cpu == "x64")) { sources += [ "jsimd_none.c" ] } else { public_deps += [ ":simd" ] - if ((current_cpu == "arm" && arm_version >= 7 && - (arm_use_neon || arm_optionally_use_neon)) || - current_cpu == "arm64") { + if ((current_cpu == "arm" || current_cpu == "arm64") && arm_use_neon) { defines += [ "NEON_INTRINSICS", ] } } |