6 files changed, 41 insertions, 44 deletions
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 6f3dd9992..0e9a94b53 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -89,10 +89,13 @@ export CC=${CC:-gcc}
 export CXX=${CXX:-g++}
 
 # Keep memory usage as low as possible when linking:
-SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats"
+SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats -Wl,--reduce-memory-overheads"
 export LDFLAGS="$SLKLDFLAGS"
 export MOZ_LINK_FLAGS="$SLKLDFLAGS"
 
+# Set linker to use:
+LINKER=bfd
+
 # Put Rust objects on a diet to keep the linker from running into memory
 # issues (especially on 32-bit):
 export RUSTFLAGS="-Cdebuginfo=0"
@@ -125,25 +128,25 @@ export RUSTFLAGS="-Cdebuginfo=0"
 PGO=${PGO:-no}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-Os"
+  SLKCFLAGS="-O2 -g0"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-Os"
+  SLKCFLAGS="-O2 -g0"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -g0"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -g0 -fPIC"
   LIBDIRSUFFIX="64"
 elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+  SLKCFLAGS="-O2 -g0 -march=armv4 -mtune=xscale"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
+  SLKCFLAGS="-O2 -g0 -march=armv4t"
   LIBDIRSUFFIX=""
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -g0"
   LIBDIRSUFFIX=""
 fi
 
@@ -230,9 +233,10 @@ OPTIONS="\
   --enable-alsa \
   --enable-application=browser \
   --enable-default-toolkit=cairo-gtk3-wayland \
-  --enable-linker=gold \
+  --enable-linker=$LINKER \
   $GOOGLE_API_KEY \
-  --enable-strip \
+  --disable-strip \
+  --disable-install-strip \
   --enable-cpp-rtti \
   --enable-accessibility \
   --disable-crashreporter \
diff --git a/source/xap/mozilla-thunderbird/gold/gold b/source/xap/mozilla-thunderbird/gold/gold
deleted file mode 120000
index 6cd03701c..000000000
--- a/source/xap/mozilla-thunderbird/gold/gold
+++ /dev/null
@@ -1 +0,0 @@
-ld.gold
-\ No newline at end of file
diff --git a/source/xap/mozilla-thunderbird/gold/ld b/source/xap/mozilla-thunderbird/gold/ld
deleted file mode 120000
index 6cd03701c..000000000
--- a/source/xap/mozilla-thunderbird/gold/ld
+++ /dev/null
@@ -1 +0,0 @@
-ld.gold
-\ No newline at end of file
diff --git a/source/xap/mozilla-thunderbird/gold/ld.gold b/source/xap/mozilla-thunderbird/gold/ld.gold
deleted file mode 100755
index f1d76b3a4..000000000
--- a/source/xap/mozilla-thunderbird/gold/ld.gold
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Doing this for 32-bit... sigh. May have to try to figure out how to only
-# use it in 32-bit userspace even when running under a 64-bit kernel.
-/usr/bin/ld.gold --no-map-whole-files --no-keep-memory --no-keep-files-mapped "$@"
-# Old simple way:
-#/usr/bin/ld.gold "$@"
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 4804e26df..ee2442ff0 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -94,47 +94,40 @@ fi
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS=""
   LIBDIRSUFFIX=""
-  OPTIMIZE=${OPTIMIZE:-"-Os"}
+  OPTIMIZE=${OPTIMIZE:-"-O2 -g0"}
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS=""
   LIBDIRSUFFIX=""
-  OPTIMIZE=${OPTIMIZE:-"-Os"}
+  OPTIMIZE=${OPTIMIZE:-"-O2 -g0"}
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-fPIC"
   LIBDIRSUFFIX="64"
-  OPTIMIZE=${OPTIMIZE:-"-O2"}
+  OPTIMIZE=${OPTIMIZE:-"-O2 -g0"}
 elif [ "$ARCH" = "arm" ]; then
   SLKCFLAGS="-march=armv4 -mtune=xscale"
   LIBDIRSUFFIX=""
-  OPTIMIZE=${OPTIMIZE:-"-O2"}
+  OPTIMIZE=${OPTIMIZE:-"-O2 -g0"}
 else
   SLKCFLAGS=""
   LIBDIRSUFFIX=""
-  OPTIMIZE=${OPTIMIZE:-"-O2"}
+  OPTIMIZE=${OPTIMIZE:-"-O2 -g0"}
 fi
 
 # Choose a compiler (gcc/g++ or clang/clang++):
 export CC=${CC:-gcc}
 export CXX=${CXX:-g++}
 
-## Link using gold.  This avoids running out of memory on 32-bit systems, and
-## avoids a recurring build failure with GNU ld on other systems.
-#PATH="$(pwd)/gold:$PATH"
-#export CC="$CC -B$(pwd)/gold"
-#export CXX="$CXX -B$(pwd)/gold"
-
 # Keep memory usage as low as possible when linking:
-SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats"
+SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats -Wl,--reduce-memory-overheads"
 export LDFLAGS="$SLKLDFLAGS"
 export MOZ_LINK_FLAGS="$SLKLDFLAGS"
 
-# If you don't give this _something_ then it defaults to -g, causing more
-# link time memory issues:
-export MOZ_DEBUG_FLAGS="-g0"
+# Set linker to use:
+LINKER=bfd
 
 # Put Rust objects on a diet to keep the linker from running into memory
 # issues (especially on 32-bit):
-export RUSTFLAGS="-Cdebuginfo=0 -Copt-level=0"
+export RUSTFLAGS="-Cdebuginfo=0"
 
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mozilla-thunderbird
@@ -221,7 +214,9 @@ OPTIONS="\
   --enable-application=comm/mail \
   $ENABLE_CALENDAR \
   --enable-default-toolkit=cairo-gtk3-wayland \
-  --enable-strip \
+  --enable-linker=$LINKER \
+  --disable-strip \
+  --disable-install-strip \
   --enable-cpp-rtti \
   --enable-accessibility \
   $GOOGLE_API_KEY \
diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild
index cd4a58f27..80f9c8bf0 100755
--- a/source/xap/seamonkey/seamonkey.SlackBuild
+++ b/source/xap/seamonkey/seamonkey.SlackBuild
@@ -58,13 +58,13 @@ fi
 
 if [ "$ARCH" = "i686" ]; then
   LIBDIRSUFFIX=""
-  OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1"}
+  OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1 -g0"}
 elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
-  OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1"}
+  OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1 -g0"}
 else
   LIBDIRSUFFIX=""
-  OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1"}
+  OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1 -g0"}
 fi
 
 # Choose a compiler (gcc/g++ or clang/clang++):
@@ -77,12 +77,17 @@ export CFLAGS="-Wformat -fno-delete-null-pointer-checks"
 export CXXFLAGS="-Wformat -fno-delete-null-pointer-checks -fpermissive"
 
 # Keep memory usage as low as possible when linking:
-SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats"
+SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats -Wl,--reduce-memory-overheads"
 export LDFLAGS="$SLKLDFLAGS"
 export MOZ_LINK_FLAGS="$SLKLDFLAGS"
 
-# Don't use icecream:
-PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+# Don't use icecream with clang:
+if [ "$CC" = "clang" ]; then
+  PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+fi
+
+# Set linker to use:
+LINKER=bfd
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -139,8 +144,9 @@ OPTIONS="\
   --enable-startup-notification \
   --enable-alsa \
   --disable-debug \
-  --enable-gold \
-  --enable-strip \
+  --enable-linker=$LINKER \
+  --disable-strip \
+  --disable-install-strip \
   --disable-tests \
   --disable-crashreporter \
   --enable-accessibility \