freetype2: work around GCC 12 ARM NEON bug (#1994)

Cf. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117811.
koreader · Nov 30, 2024 · e9b79c3 · e9b79c3
1 parent 84ffb30
commit e9b79c3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/thirdparty/freetype2/CMakeLists.txt b/thirdparty/freetype2/CMakeLists.txt
@@ -1,4 +1,8 @@
-list(APPEND PATCH_FILES fix_meson_bzip2_option.patch)
+list(APPEND PATCH_FILES
+    fix_meson_bzip2_option.patch
+    # Work around GCC 12 ARM NEON bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117811).
+    ftcalc_gcc12_arm_neon_fix.patch
+)
 
 list(APPEND CFG_CMD COMMAND
     ${MESON_SETUP} --default-library=$<IF:$<BOOL:${MONOLIBTIC}>,static,shared>

diff --git a/thirdparty/freetype2/ftcalc_gcc12_arm_neon_fix.patch b/thirdparty/freetype2/ftcalc_gcc12_arm_neon_fix.patch
@@ -0,0 +1,12 @@
+--- i/src/base/ftcalc.c
++++ w/src/base/ftcalc.c
+@@ -750,7 +750,8 @@
+
+     shift = FT_MSB( val ) - 12;
+
+-    if ( shift > 0 )
++    if ( shift < 0 )
++        shift = 0;
+     {
+       xx >>= shift;
+       xy >>= shift;