Backed out 3 changesets (bug 1271794, bug 1271829) on suspicion of making Windows builds less likely to... build
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 18 May 2016 00:04:29 -0400
changeset 336858 cbb9d4a22c5c20703b6fedf78c7b27ae7d62d897
parent 336857 332cc4bcd8c17d0b23d129efb7f1820569a4fd77
child 336859 71f52a621b182723ad5105172413ab67dec2b75e
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1271794, 1271829
milestone49.0a1
backs outd0ab0d508a248687825497a6a50ec9a685a7a5f9
9f4983dfd88188dc9c679d095133fabbcadb48db
28b45df659b7274ea988430538f941ba21dfc2ac
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
Backed out 3 changesets (bug 1271794, bug 1271829) on suspicion of making Windows builds less likely to... build CLOSED TREE Backed out changeset d0ab0d508a24 (bug 1271829) Backed out changeset 9f4983dfd881 (bug 1271829) Backed out changeset 28b45df659b7 (bug 1271794)
config/external/nss/Makefile.in
js/src/old-configure.in
old-configure.in
security/sandbox/win/wow_helper/Makefile.in
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -239,17 +239,17 @@ DEFAULT_GMAKE_FLAGS += \
 endif
 
 DEFAULT_GMAKE_FLAGS += FREEBL_NO_DEPEND=0 $(FREEBL_LOWHASH_FLAG)
 
 ifdef MOZ_NO_WLZDEFS
 DEFAULT_GMAKE_FLAGS += ZDEFS_FLAG=
 endif
 ifdef MOZ_CFLAGS_NSS
-XCFLAGS += $(filter-out -W%,$(CFLAGS))
+DEFAULT_GMAKE_FLAGS += XCFLAGS='$(filter-out -W%,$(CFLAGS))'
 DEFAULT_GMAKE_FLAGS += DARWIN_DYLIB_VERSIONS='-compatibility_version 1 -current_version 1 $(LDFLAGS)'
 endif
 ifeq (1_1,$(CLANG_CL)_$(MOZ_ASAN))
 XLDFLAGS := $(OS_LDFLAGS)
 DEFAULT_GMAKE_FLAGS += XLDFLAGS='$(XLDFLAGS)'
 endif
 
 DEFAULT_GMAKE_FLAGS += NSS_NO_PKCS11_BYPASS=1
@@ -262,29 +262,19 @@ DEFAULT_GMAKE_FLAGS += MODULE_INCLUDES='
 # Work around NSS's MAKE_OBJDIR being racy. See bug #836220
 DEFAULT_GMAKE_FLAGS += MAKE_OBJDIR='$$(INSTALL) -D $$(OBJDIR)'
 
 # Work around NSS adding IMPORT_LIBRARY to TARGETS with no rule for
 # it, creating race conditions. See bug #836220
 DEFAULT_GMAKE_FLAGS += TARGETS='$$(LIBRARY) $$(SHARED_LIBRARY) $$(PROGRAM)'
 
 ifdef MOZ_FOLD_LIBS_FLAGS
-XCFLAGS += $(MOZ_FOLD_LIBS_FLAGS)
+DEFAULT_GMAKE_FLAGS += XCFLAGS='$(MOZ_FOLD_LIBS_FLAGS)'
 endif
 
-# Pass on the MSVC target arch from the main build system.
-# Note this is case- and switch-character sensitive, while
-# the MSVC option is not.
-ifeq (WINNT,$(OS_TARGET))
-XCFLAGS += $(filter -arch:%,$(CFLAGS))
-endif
-
-# Export accumulated XCFLAGS to modify nss defaults.
-DEFAULT_GMAKE_FLAGS += XCFLAGS='$(XCFLAGS)'
-
 NSS_SRCDIR = $(topsrcdir)
 
 NSS_DIRS =
 ifndef MOZ_FOLD_LIBS
 NSS_DIRS += nss/lib
 else
 ifndef NSS_DISABLE_DBM
 NSS_DIRS += nss/lib/dbm
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -977,26 +977,20 @@ case "$target" in
         WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION
         WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
         DSO_LDOPTS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
         _USE_CPP_INCLUDE_FLAG=1
         _DEFINES_CFLAGS='-FI $(topobjdir)/js/src/js-confdefs.h -DMOZILLA_CLIENT'
         _DEFINES_CXXFLAGS='-FI $(topobjdir)/js/src/js-confdefs.h -DMOZILLA_CLIENT'
         CFLAGS="$CFLAGS -W3 -Gy"
         CXXFLAGS="$CXXFLAGS -W3 -Gy"
-        if test "$CPU_ARCH" = "x86";then
-          dnl VS2012+ defaults to -arch:SSE2. We want to target nothing
-          dnl more recent, so set that explicitly here unless another
-          dnl target arch has already been set.
-          if test -z `echo $CFLAGS | grep -i [-/]arch:` ; then
-            CFLAGS="$CFLAGS -arch:SSE2"
-            fi
-          if test -z `echo $CXXFLAGS | grep -i [-/]arch:` ; then
-            CXXFLAGS="$CXXFLAGS -arch:SSE2"
-          fi
+        if test "$CPU_ARCH" = "x86"; then
+            dnl VS2012+ defaults to -arch:SSE2.
+            CFLAGS="$CFLAGS -arch:IA32"
+            CXXFLAGS="$CXXFLAGS -arch:IA32"
         fi
         dnl VS2013+ requires -FS when parallel building by make -jN.
         dnl If nothing, compiler sometimes causes C1041 error.
         CFLAGS="$CFLAGS -FS"
         CXXFLAGS="$CXXFLAGS -FS"
         # khuey says we can safely ignore MSVC warning C4251
         # MSVC warning C4244 (implicit type conversion may lose data) warns
         # and requires workarounds for perfectly valid code.  Also, GCC/clang
--- a/old-configure.in
+++ b/old-configure.in
@@ -1373,25 +1373,19 @@ case "$target" in
         WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
         DSO_LDOPTS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
         _USE_CPP_INCLUDE_FLAG=1
         _DEFINES_CFLAGS='-FI $(topobjdir)/mozilla-config.h -DMOZILLA_CLIENT'
         _DEFINES_CXXFLAGS='-FI $(topobjdir)/mozilla-config.h -DMOZILLA_CLIENT'
         CFLAGS="$CFLAGS -W3 -Gy"
         CXXFLAGS="$CXXFLAGS -W3 -Gy"
         if test "$CPU_ARCH" = "x86"; then
-            dnl VS2012+ defaults to -arch:SSE2. We want to target nothing
-            dnl more recent, so set that explicitly here unless another
-            dnl target arch has already been set.
-            if test -z `echo $CFLAGS | grep -i [-/]arch:`; then
-              CFLAGS="$CFLAGS -arch:SSE2"
-            fi
-            if test -z `echo $CXXFLAGS | grep -i [-/]arch:`; then
-              CXXFLAGS="$CXXFLAGS -arch:SSE2"
-            fi
+            dnl VS2012+ defaults to -arch:SSE2.
+            CFLAGS="$CFLAGS -arch:IA32"
+            CXXFLAGS="$CXXFLAGS -arch:IA32"
             SSE_FLAGS="-arch:SSE"
             SSE2_FLAGS="-arch:SSE2"
             dnl MSVC allows the use of intrinsics without any flags
             dnl and doesn't have a separate arch for SSSE3
             SSSE3_FLAGS="-arch:SSE2"
         fi
         dnl VS2013+ requires -FS when parallel building by make -jN.
         dnl If nothing, compiler sometimes causes C1041 error.
--- a/security/sandbox/win/wow_helper/Makefile.in
+++ b/security/sandbox/win/wow_helper/Makefile.in
@@ -27,17 +27,17 @@ MOZ_WINCONSOLE = 0
 
 include $(topsrcdir)/config/config.mk
 
 # Munge the LIB variable to contain paths to the x64 CRT and system libraries.
 # Unconveniently, none of the paths have the same convention, including the
 # compiler path above.
 LIB = $(call lazy,LIB,$$(shell python -c 'import os; print ";".join(s.lower().replace(os.sep, "/").replace("/vc/lib", "/vc/lib/amd64").replace("/um/x86", "/um/x64").replace("/ucrt/x86", "/ucrt/x64") for s in os.environ["LIB"].split(";"))'))
 
-CXXFLAGS := $(filter-out -arch:%,$(CXXFLAGS))
+CXXFLAGS := $(filter-out -arch:IA32,$(CXXFLAGS))
 
 # OS_COMPILE_CXXFLAGS includes mozilla-config.h, which contains x86-specific
 # defines breaking the build.
 OS_COMPILE_CXXFLAGS :=
 
 # LNK1246: '/SAFESEH' not compatible with 'x64' target machine
 LDFLAGS := $(filter-out -SAFESEH,$(LDFLAGS))