Bug 1490566 Do not pass --enable-stdcall-fixup to clang in a x86 Windows build r=froydnj
authorTom Ritter <tom@mozilla.com>
Tue, 18 Sep 2018 13:44:05 +0000
changeset 495425 a52a76a43b14dda45aae8978166f9451f0c2ab32
parent 495424 45ae214ae1598baffb483acfc2f10121c6461d18
child 495426 8214e23b4408bd918ab0a5ebdf40aebc9786eb64
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1490566, 787653
milestone64.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 1490566 Do not pass --enable-stdcall-fixup to clang in a x86 Windows build r=froydnj clang doesn't recognize --enable-stdcall-fixup as an option. We needed this for the mingw-gcc build (added in Bug 787653) because gcc had difficulty dealing with Angle's symbol linking Differential Revision: https://phabricator.services.mozilla.com/D6072
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -1063,17 +1063,20 @@ case "$target" in
         CXXFLAGS="$CXXFLAGS -fno-keep-inline-dllexport"
     fi
 
     case "$target" in
     i*86-*)
         if test -n "$GNU_CC"; then
             CFLAGS="$CFLAGS -mstackrealign"
             CXXFLAGS="$CXXFLAGS -mstackrealign"
-            LDFLAGS="$LDFLAGS -Wl,--enable-stdcall-fixup -Wl,--large-address-aware"
+            LDFLAGS="$LDFLAGS -Wl,--large-address-aware"
+            if test -z "$CLANG_CC"; then
+                LDFLAGS="$LDFLAGS -Wl,--enable-stdcall-fixup"
+            fi
         else
             DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86"
             LDFLAGS="$LDFLAGS -SAFESEH"
         fi
 
         AC_DEFINE(_X86_)
         ;;
     x86_64-*)