Bug 1043108: Remove -arch:IA32 from non-x86 builds. r=kaie. NSS_3_17_BETA2
authorWan-Teh Chang <wtc@google.com>
Tue, 05 Aug 2014 12:35:47 -0700
changeset 11223 dc69e391132675100e5c9f7faae129ab46337c60
parent 11222 684747ac0358353c3d656444b360a3beb85983aa
child 11224 a696aeb2aa49a6871468f87f8cc4e7b3198f4cf7
push id455
push userwtc@google.com
push dateTue, 05 Aug 2014 19:35:53 +0000
reviewerskaie
bugs1043108
Bug 1043108: Remove -arch:IA32 from non-x86 builds. r=kaie.
coreconf/WIN32.mk
--- a/coreconf/WIN32.mk
+++ b/coreconf/WIN32.mk
@@ -174,21 +174,16 @@ endif
 	LDFLAGS    += /FIXED:NO
     endif
 ifneq ($(_MSC_VER),$(_MSC_VER_6))
     # Convert certain deadly warnings to errors (see list at end of file)
     OS_CFLAGS += -we4002 -we4003 -we4004 -we4006 -we4009 -we4013 \
      -we4015 -we4028 -we4033 -we4035 -we4045 -we4047 -we4053 -we4054 -we4063 \
      -we4064 -we4078 -we4087 -we4090 -we4098 -we4390 -we4551 -we4553 -we4715
 
-    # VS2012 defaults to -arch:SSE2. Use -arch:IA32 to avoid requiring SSE2.
-    ifeq ($(_MSC_VER_GE_11),1)
-	OS_CFLAGS += -arch:IA32
-    endif
-
     ifeq ($(_MSC_VER_GE_12),1)
 	OS_CFLAGS += -FS
     endif
 endif # !MSVC6
 endif # NS_USE_GCC
 
 ifdef USE_64
 DEFINES += -DWIN64
@@ -196,16 +191,21 @@ else
 DEFINES += -DWIN32
 endif
 
 ifeq (,$(filter-out x386 x86_64,$(CPU_ARCH)))
 ifdef USE_64
 	DEFINES += -D_AMD64_
 else
 	DEFINES += -D_X86_
+	# VS2012 defaults to -arch:SSE2. Use -arch:IA32 to avoid requiring
+	# SSE2.
+	ifeq ($(_MSC_VER_GE_11),1)
+		OS_CFLAGS += -arch:IA32
+	endif
 endif
 endif
 ifeq ($(CPU_ARCH), ALPHA)
 	DEFINES += -D_ALPHA_=1
 endif
 
 ifdef MAPFILE
 ifndef NS_USE_GCC