Merge b-s to m-c.

browser/installer/package-manifest.in

@@ -71,6 +71,9 @@
 #elif _MSC_VER == 1600
 @BINPATH@/msvcp100.dll
 @BINPATH@/msvcr100.dll
+#elif _MSC_VER == 1700
+@BINPATH@/msvcp110.dll
+@BINPATH@/msvcr110.dll
 #endif
 
 #endif

browser/installer/removed-files.in

@@ -1288,6 +1288,10 @@ xpicleanup@BIN_SUFFIX@
     @BINPATH@/msvcp100.dll
     @BINPATH@/msvcr100.dll
   #endif
+  #if _MSC_VER != 1700
+    @BINPATH@/msvcp110.dll
+    @BINPATH@/msvcr110.dll
+  #endif
   mozcrt19.dll
   mozcpp19.dll
 #endif

build/win32/Makefile.in

@@ -71,27 +71,34 @@ ifndef MOZ_DEBUG
 
 ifeq (1400,$(_MSC_VER))
 REDIST_FILES = \
-	Microsoft.VC80.CRT.manifest \
-	msvcm80.dll \
-	msvcp80.dll \
-	msvcr80.dll \
-	$(NULL)
+  Microsoft.VC80.CRT.manifest \
+  msvcm80.dll \
+  msvcp80.dll \
+  msvcr80.dll \
+  $(NULL)
 endif
 
 ifeq (1500,$(_MSC_VER))
 REDIST_FILES = \
-	Microsoft.VC90.CRT.manifest \
-	msvcm90.dll \
-	msvcp90.dll \
-	msvcr90.dll \
-	$(NULL)
+  Microsoft.VC90.CRT.manifest \
+  msvcm90.dll \
+  msvcp90.dll \
+  msvcr90.dll \
+  $(NULL)
 endif
 
 ifeq (1600,$(_MSC_VER))
 REDIST_FILES = \
-	msvcp100.dll \
-	msvcr100.dll \
-	$(NULL)
+  msvcp100.dll \
+  msvcr100.dll \
+  $(NULL)
+endif
+
+ifeq (1700,$(_MSC_VER))
+REDIST_FILES = \
+  msvcp110.dll \
+  msvcr110.dll \
+  $(NULL)
 endif
 
 ifdef REDIST_FILES

configure.in

@@ -745,6 +745,10 @@ case "$target" in
             _CC_SUITE=10
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
+        elif test "$_CC_MAJOR_VERSION" = "17"; then
+            _CC_SUITE=11
+            AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
+            AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
         else
             AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
         fi

gfx/cairo/libpixman/src/Makefile.in

@@ -94,6 +94,11 @@ MMX_CFLAGS+=--param inline-unit-growth=10000 --param large-function-growth=10000
 endif
 endif
 ifeq (arm,$(findstring arm,$(OS_TEST)))
+# Apple's arm assembler doesn't support the same syntax as
+# the standard GNU assembler, so use the C fallback paths for now.
+# This may be fixable if clang's ARM/iOS assembler improves into a
+# viable solution in the future.
+ifneq (Darwin,$(OS_ARCH))
 ifdef HAVE_ARM_SIMD
 USE_ARM_SIMD_GCC=1
 endif
@@ -101,6 +106,7 @@ ifdef HAVE_ARM_NEON
 USE_ARM_NEON_GCC=1
 endif
 endif
+endif
 
 endif
 

js/src/configure.in

@@ -742,6 +742,10 @@ case "$target" in
             _CC_SUITE=10
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
+        elif test "$_CC_MAJOR_VERSION" = "17"; then
+            _CC_SUITE=11
+            AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
+            AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
         else
             AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
         fi

mobile/installer/package-manifest.in

@@ -72,6 +72,9 @@
 #elif _MSC_VER == 1600
 @BINPATH@/msvcp100.dll
 @BINPATH@/msvcr100.dll
+#elif _MSC_VER == 1700
+@BINPATH@/msvcp110.dll
+@BINPATH@/msvcr110.dll
 #endif
 
 #endif

mobile/installer/removed-files.in

@@ -19,6 +19,10 @@ extensions/feedback@mobile.mozilla.org.xpi
     @BINPATH@/msvcp100.dll
     @BINPATH@/msvcr100.dll
   #endif
+  #if _MSC_VER != 1700
+    @BINPATH@/msvcp110.dll
+    @BINPATH@/msvcr110.dll
+  #endif
   mozcrt19.dll
   mozcpp19.dll
 #endif

toolkit/mozapps/installer/packager.mk

@@ -104,6 +104,9 @@ endif
 ifeq ($(_MSC_VER),1600)
 JSSHELL_BINS += $(DIST)/bin/msvcr100.dll
 endif
+ifeq ($(_MSC_VER),1700)
+JSSHELL_BINS += $(DIST)/bin/msvcr110.dll
+endif
 else
 JSSHELL_BINS += \
   $(DIST)/bin/$(LIB_PREFIX)plds4$(DLL_SUFFIX) \