From 41be4ce903b8f1ae2767ba3839d70c56dd64ed8a Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Thu, 9 Apr 2020 11:12:10 +0200
Subject: libre/icedove: fixed build for arm

---
 libre/icedove/PKGBUILD           | 17 ++++++++++-------
 libre/icedove/arm-wasm-vfp.patch | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 libre/icedove/arm-wasm-vfp.patch

(limited to 'libre')

diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index d931a829a..719c4ead5 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -43,6 +43,7 @@ source+=(
          https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig}
          libre-searchengines.patch
          mozilla-1338795-regression.patch)
+source_armv7h=(arm-wasm-vfp.patch)
 sha256sums=('4e3b8fdcfae12e7d49232a9c324e82d47ed94b371031f31baf69b2f7c2fb5b51'
             'SKIP'
             'af8199a12ebe09189d143458bd1e2d0071aff3410ed121dc2329a448a56632f0'
@@ -50,6 +51,7 @@ sha256sums=('4e3b8fdcfae12e7d49232a9c324e82d47ed94b371031f31baf69b2f7c2fb5b51'
             'SKIP'
             '072bba9d9ef4cfcb03b3776a15e52020e05c685add38329bd041f680026f5898'
             'dbec24e57a445b1076a11fde00d0f5b8cd53ce314c2b9d3cd2a83bd84fc25375')
+sha256sums_armv7h=(bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966)
 validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software Releases <release@mozilla.com>
 validpgpkeys+=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin
 
@@ -102,17 +104,22 @@ ac_add_options --disable-tests
 END
 
   if [[ $CARCH = arm* ]]; then
+    patch -Np1 -i "$srcdir"/arm-wasm-vfp.patch
+
     sed -i '/--enable-linker=gold/d' .mozconfig
     sed -i '/--enable-hardening/d' .mozconfig
     sed -i '/--enable-optimize/d' .mozconfig
 
-    LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
-    export LDFLAGS
+    export MOZ_DEBUG_FLAGS=" "
+    export CFLAGS+=" -g0"
+    export CXXFLAGS+=" -g0"
+    export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+    export RUSTFLAGS="-Cdebuginfo=0"
 
     cat >> .mozconfig <<END
 ac_add_options --disable-webrtc
 ac_add_options --disable-elf-hack
-ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"
+ac_add_options --enable-optimize="-g0 -O2"
 END
   fi
 
@@ -167,10 +174,6 @@ END
 build() {
   cd $_pkgname-$pkgver
 
-  # our default cflags are not appreciated by clang
-  export CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
-  export CXXFLAGS="${CXXFLAGS/-fvar-tracking-assignments/}"
-
   if [[ $CARCH = armv7h ]]; then
     export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
     sed -i "s/\(cargo_rustc_flags += -C lto\)/#\1/" config/rules.mk
diff --git a/libre/icedove/arm-wasm-vfp.patch b/libre/icedove/arm-wasm-vfp.patch
new file mode 100644
index 000000000..9e2ed1510
--- /dev/null
+++ b/libre/icedove/arm-wasm-vfp.patch
@@ -0,0 +1,15 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
+
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp.orig b/js/src/wasm/WasmSignalHandlers.cpp
+index 636537f..0f3461a 100644
+--- a/js/src/wasm/WasmSignalHandlers.cpp.orig
++++ b/js/src/wasm/WasmSignalHandlers.cpp
+@@ -244,7 +244,7 @@ using mozilla::DebugOnly;
+ // emulation here.
+ 
+ #if defined(__linux__) && defined(__arm__)
+-#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
++//#  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+ #endif
+ 
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-- 
cgit v1.2.3