From: Emanuele Rocca Date: Fri, 17 Mar 2023 21:48:32 +0000 (+0900) Subject: Bug 1822827 - Remove explicit NEON flags from skia build X-Git-Tag: archive/raspbian/102.11.0esr-1_deb11u1+rpi1^2~18 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=859889311f2e5f3ae096ca48f6b90d3215ec117b;p=firefox-esr.git Bug 1822827 - Remove explicit NEON flags from skia build While Firefox builds for Android ARMv7 don't support non-NEON processors, downstreams (including non-Android ones) may still want to support them. Because those Firefox builds don't support non-NEON processors, the NEON flags are actually already passed globally, and they don't need to be explicitly added. NEON_FLAGS is actually only meant to be used for sources that specifically need NEON support even when the target doesn't support it, for, e.g. specialized code behind runtime CPU detection. Gbp-Pq: Topic porting Gbp-Pq: Name Bug-1822827-Remove-explicit-NEON-flags-from-skia-bui.patch --- diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py index 5e0fd17d797..580f0928e23 100755 --- a/gfx/skia/generate_mozbuild.py +++ b/gfx/skia/generate_mozbuild.py @@ -59,8 +59,6 @@ if CONFIG['INTEL_ARCHITECTURE']: SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2'] SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx'] SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c', '-mfma'] -elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CXXFLAGS += CONFIG['NEON_FLAGS'] elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'): SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags += ['-march=armv8-a+crc'] diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index 524bd28dac6..5fb71746ee3 100755 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -455,8 +455,6 @@ if CONFIG['INTEL_ARCHITECTURE']: SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2'] SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx'] SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c', '-mfma'] -elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CXXFLAGS += CONFIG['NEON_FLAGS'] elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'): SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags += ['-march=armv8-a+crc']