diff options
-rw-r--r-- | configure.ac | 15 | ||||
-rw-r--r-- | external/icu/ExternalProject_icu.mk | 2 | ||||
-rw-r--r-- | external/libxml2/libxml2-vc10.patch | 2 | ||||
-rw-r--r-- | external/libxslt/libxslt-msvc-sym.patch.2 | 2 | ||||
-rw-r--r-- | external/libxslt/libxslt-msvc.patch.2 | 2 | ||||
-rw-r--r-- | external/lpsolve/lp_solve_5.5-windows.patch | 2 | ||||
-rw-r--r-- | external/nss/ExternalProject_nss.mk | 2 | ||||
-rw-r--r-- | external/xmlsec/ExternalProject_xmlsec.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 10 |
9 files changed, 15 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 0297a5e4a6ca..762e43987656 100644 --- a/configure.ac +++ b/configure.ac @@ -3559,10 +3559,6 @@ if test "$_os" = "WINNT"; then CC=$MSVC_CXX CC_BASE=`first_arg_basename "$CC"` fi - if test "$BITNESS_OVERRIDE" = ""; then - dnl since MSVC 2012, default for x86 is -arch:SSE2: - MSVC_CXX="$MSVC_CXX -arch:SSE" - fi if test -z "$CXX"; then CXX=$MSVC_CXX CXX_BASE=`first_arg_basename "$CXX"` @@ -3578,10 +3574,6 @@ if test "$_os" = "WINNT"; then COMPATH=$VC_PRODUCT_DIR fi fi - if test "$BITNESS_OVERRIDE" = ""; then - dnl since MSVC 2012, default for x86 is -arch:SSE2: - CC="$CC -arch:SSE" - fi COMPATH="$COMPATH/Tools/MSVC/$vcbuildnumber" @@ -6850,8 +6842,7 @@ else # MSVC seems to differentiate only between SSE and SSE2, where in fact # SSE2 seems to be SSE2+. # Even if -arch:SSE2 is the default, set it explicitly, so that the variable - # is not empty (and can be tested in gbuild), moreover we now default to SSE - # for 32bit x86. + # is not empty (and can be tested in gbuild). flag_sse2=-arch:SSE2 flag_ssse3=-arch:SSE2 flag_sse41=-arch:SSE2 @@ -11153,9 +11144,9 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then AC_MSG_CHECKING([for clang-cl]) if test -x "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"; then CLANG_CC=`win_short_path_for_make "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"` - dnl match our MSVC default, also explicitly set -m32/-m64 + dnl explicitly set -m32/-m64 if test "$BITNESS_OVERRIDE" = ""; then - CLANG_CC="$CLANG_CC -m32 -arch:SSE" + CLANG_CC="$CLANG_CC -m32" else CLANG_CC="$CLANG_CC -m64" fi diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 1845ec3472a1..f62d8528cd8d 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -22,7 +22,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : $(call gb_Trace_StartRange,icu,EXTERNAL) $(call gb_ExternalProject_run,build,\ export LIB="$(ILIB)" \ - && CFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" \ + && CFLAGS="-FS $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="-FS $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" \ INSTALL=`cygpath -m /usr/bin/install` \ ./runConfigureICU \ $(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug --disable-release) \ diff --git a/external/libxml2/libxml2-vc10.patch b/external/libxml2/libxml2-vc10.patch index 3892b518d35d..15bc4d973ea7 100644 --- a/external/libxml2/libxml2-vc10.patch +++ b/external/libxml2/libxml2-vc10.patch @@ -6,7 +6,7 @@ Add SOLARINC, and disable SSE2 default for MSVC2012 CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H" !endif CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE -+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) ++CFLAGS = $(CFLAGS) $(SOLARINC) # The linker and its options. LD = link.exe diff --git a/external/libxslt/libxslt-msvc-sym.patch.2 b/external/libxslt/libxslt-msvc-sym.patch.2 index e4d4e673f339..636c22a82e45 100644 --- a/external/libxslt/libxslt-msvc-sym.patch.2 +++ b/external/libxslt/libxslt-msvc-sym.patch.2 @@ -4,7 +4,7 @@ CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D "_REENTRANT" CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX) CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE -+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common ++CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common # The linker and its options. LD = link.exe diff --git a/external/libxslt/libxslt-msvc.patch.2 b/external/libxslt/libxslt-msvc.patch.2 index 0df207e7b251..fea5f9dc6df3 100644 --- a/external/libxslt/libxslt-msvc.patch.2 +++ b/external/libxslt/libxslt-msvc.patch.2 @@ -4,7 +4,7 @@ CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D "_REENTRANT" CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX) CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE -+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common ++CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common # The linker and its options. LD = link.exe diff --git a/external/lpsolve/lp_solve_5.5-windows.patch b/external/lpsolve/lp_solve_5.5-windows.patch index 1ea580dc8311..16d5261c7c7f 100644 --- a/external/lpsolve/lp_solve_5.5-windows.patch +++ b/external/lpsolve/lp_solve_5.5-windows.patch @@ -46,7 +46,7 @@ -rc lpsolve.rc
+rc %SOLARINC% lpsolve.rc
-%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -o lpsolve55.dll
-+%c% -arch:SSE -Zi -FS -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
++%c% -Zi -FS -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
-rem /link /LINK50COMPAT
-
-if exist a.obj del a.obj
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index acf418805772..796d8151c168 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \ $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \ LIB="$(ILIB)" \ - XCFLAGS="-arch:SSE $(SOLARINC)" \ + XCFLAGS="$(SOLARINC)" \ $(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \ NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ NSS_DISABLE_GTESTS=1 \ diff --git a/external/xmlsec/ExternalProject_xmlsec.mk b/external/xmlsec/ExternalProject_xmlsec.mk index aca7a2072057..c530b69d5bcd 100644 --- a/external/xmlsec/ExternalProject_xmlsec.mk +++ b/external/xmlsec/ExternalProject_xmlsec.mk @@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : cscript /e:javascript configure.js crypto=mscng xslt=no iconv=no static=no \ lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \ $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes cruntime=/MDd) \ - cflags="-arch:SSE $(SOLARINC) -I$(WORKDIR)/UnpackedTarball/libxml2/include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common" \ + cflags="$(SOLARINC) -I$(WORKDIR)/UnpackedTarball/libxml2/include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common" \ && nmake \ ,win32) $(call gb_Trace_EndRange,xmlsec,EXTERNAL) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 848cb96397e3..b9bde52cdc01 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -41,7 +41,7 @@ define gb_CObject__compiler $(if $(filter %.c,$(2)), \ $(if $(3), $(3), $(gb_CC)), \ $(if $(filter -clr,$(1)), \ - $(MSVC_CXX) -I$(SRCDIR)/solenv/clang-cl, + $(MSVC_CXX) -I$(SRCDIR)/solenv/clang-cl, \ $(if $(3), $(3), $(gb_CXX)))))) endef @@ -57,10 +57,10 @@ define gb_CObject__command_pattern $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ unset INCLUDE && \ - $(filter-out -arch:SSE,$(call gb_CObject__compiler,$(2),$(3),$(7))) \ + $(call gb_CObject__compiler,$(2),$(3),$(7)) \ $(DEFS) \ $(gb_LTOFLAGS) \ - $(call gb_Helper_remove_overridden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(2),$(3))) \ + $(call gb_Helper_remove_overridden_flags, \ $(2) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \ $(if $(EXTERNAL_CODE), \ $(if $(filter -clr,$(2)),,$(if $(COM_IS_CLANG),-Wno-undef)), \ @@ -98,8 +98,8 @@ $(call gb_Output_announce,$(2),$(true),PCH,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \ unset INCLUDE && \ - $(filter-out -arch:SSE,$(call gb_CObject__compiler,$(4) $(5),$(3),$(8))) \ - $(call gb_Helper_remove_overridden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(4) $(5),$(3))) \ + $(call gb_CObject__compiler,$(4) $(5),$(3),$(8)) \ + $(call gb_Helper_remove_overridden_flags, \ $(4) $(5) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \ -Fd$(PDBFILE) \ $(if $(EXTERNAL_CODE),$(if $(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \ |