Bug 1481378 - Simplify mozconfig.linux32. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 07 Aug 2018 16:28:13 +0900
changeset 430338 ef7f43b981ef872b3faa3a8d62d8115d59df1cd2
parent 430337 738e88d3b78eaa4d34cc5d16fc9d2e2b993e228e
child 430339 1efeecd0ac69a8f5852ee48e3a5539e3b3e367e4
push id34401
push useraiakab@mozilla.com
push dateTue, 07 Aug 2018 15:42:55 +0000
treeherdermozilla-central@936c5d6bd40b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1481378
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1481378 - Simplify mozconfig.linux32. r=ted All CI builds for linux32 have been running on 64-bits hosts for a long while now, and there are no 32-bits hosts left. We can remove the special-casing that makes the linux32 builds behave differently depending on the bit-width of the host. Furthermore, configure has been able to deal with adding -m32 on its own, so we don't need to add it to $CC/$CXX manually anymore.
build/unix/mozconfig.linux32
--- a/build/unix/mozconfig.linux32
+++ b/build/unix/mozconfig.linux32
@@ -1,13 +1,9 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 export MOZ_LINUX_32_SSE2_STARTUP_ERROR=1
 
-CFLAGS="$CFLAGS -msse -msse2 -mfpmath=sse"
-CXXFLAGS="$CXXFLAGS -msse -msse2 -mfpmath=sse"
+CFLAGS="$CFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
+CXXFLAGS="$CXXFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
 
-if test `uname -m` = "x86_64"; then
-  CC="$CC -m32 -march=pentium-m"
-  CXX="$CXX -m32 -march=pentium-m"
-  ac_add_options --target=i686-pc-linux
-  ac_add_options --host=i686-pc-linux
-fi
+ac_add_options --target=i686-pc-linux
+ac_add_options --host=i686-pc-linux