diff options
| author | Wan-Teh Chang <wtc@google.com> | 2014-04-24 10:02:49 -0700 |
|---|---|---|
| committer | Wan-Teh Chang <wtc@google.com> | 2014-04-24 10:02:49 -0700 |
| commit | c243344ad40b8cb6d0dca9cb86c63ea5152f4b15 (patch) | |
| tree | e0c5d80720dd3eb6caf5056107d354d098f48f8c /coreconf/WIN32.mk | |
| parent | 5fcbc1ab77d081ca3b938c63644c78838ae1e527 (diff) | |
| download | nss-hg-c243344ad40b8cb6d0dca9cb86c63ea5152f4b15.tar.gz | |
Bug 979703: Check for Visual C++ 2010 SP1 for the _xgetbv compiler
intrinsic function. Use the Visual C++ internal version 12 for
Visual C++ 2013. Pass the -nologo option to the assembler. r=kaie.
Diffstat (limited to 'coreconf/WIN32.mk')
| -rw-r--r-- | coreconf/WIN32.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk index 6d1297d87..afece4993 100644 --- a/coreconf/WIN32.mk +++ b/coreconf/WIN32.mk @@ -41,7 +41,11 @@ else _CC_BUILD := $(word 4,$(_CC_VERSION_WORDS)) _MSC_VER = $(_CC_VMAJOR)$(_CC_VMINOR) _MSC_VER_6 = 1200 - _MSC_VER_GE_18 := $(shell expr $(_MSC_VER) \>= 1800) + # VC10 (2010) is 16.00.30319.01, VC10SP1 is 16.00.40219.01. + _MSC_VER_GE_10SP1 := $(shell expr $(_MSC_VER) \> 1600 \| \ + $(_MSC_VER) = 1600 \& $(_CC_RELEASE) \>= 40219) + # VC12 (2013). + _MSC_VER_GE_12 := $(shell expr $(_MSC_VER) \>= 1800) ifeq ($(_CC_VMAJOR),14) # -DYNAMICBASE is only supported on VC8SP1 or newer, # so be very specific here! @@ -173,7 +177,7 @@ ifneq ($(_MSC_VER),$(_MSC_VER_6)) -we4015 -we4028 -we4033 -we4035 -we4045 -we4047 -we4053 -we4054 -we4063 \ -we4064 -we4078 -we4087 -we4090 -we4098 -we4390 -we4551 -we4553 -we4715 - ifeq ($(_MSC_VER_GE_18),1) + ifeq ($(_MSC_VER_GE_12),1) OS_CFLAGS += -FS endif endif # !MSVC6 @@ -218,10 +222,10 @@ ifdef NS_USE_GCC else ifdef USE_64 AS = ml64.exe - ASFLAGS = -Cp -Sn -Zi $(INCLUDES) + ASFLAGS = -nologo -Cp -Sn -Zi $(INCLUDES) else AS = ml.exe - ASFLAGS = -Cp -Sn -Zi -coff $(INCLUDES) + ASFLAGS = -nologo -Cp -Sn -Zi -coff $(INCLUDES) endif endif |