mozilla rel-257 rebase part 14

comm-esr60/mozilla-esr60/patches/1485224-1-64a1.patch

@@ -1,84 +0,0 @@
-# HG changeset patch
-# User Masatoshi Kimura <VYV03354@nifty.ne.jp>
-# Date 1536834138 -32400
-# Node ID 131188fb2361caf66b023dd24b72d21d7cb70d19
-# Parent  b275cd2315d7044bcc459369558935d56e4cae28
-Bug 1485224 - Make best efforts to write a stack frame atomically. r=froydnj
-
-diff --git a/xpcom/base/nsTraceRefcnt.cpp b/xpcom/base/nsTraceRefcnt.cpp
---- a/xpcom/base/nsTraceRefcnt.cpp
-+++ b/xpcom/base/nsTraceRefcnt.cpp
-@@ -837,38 +837,67 @@ InitTraceLog()
-     gLogging = FullLogging;
-   }
- }
- 
- 
- extern "C" {
- 
- static void
-+EnsureWrite(FILE* aStream, const char* aBuf, size_t aLen)
-+{
-+#ifdef XP_WIN
-+  int fd = _fileno(aStream);
-+#else
-+  int fd = fileno(aStream);
-+#endif
-+  while (aLen > 0) {
-+#ifdef XP_WIN
-+    auto written = _write(fd, aBuf, aLen);
-+#else
-+    auto written = write(fd, aBuf, aLen);
-+#endif
-+    if (written <= 0 || size_t(written) > aLen) {
-+      break;
-+    }
-+    aBuf += written;
-+    aLen -= written;
-+  }
-+}
-+
-+static void
- PrintStackFrame(uint32_t aFrameNumber, void* aPC, void* aSP, void* aClosure)
- {
-   FILE* stream = (FILE*)aClosure;
-   MozCodeAddressDetails details;
--  char buf[1024];
-+  static const size_t buflen = 1024;
-+  char buf[buflen + 1];  // 1 for trailing '\n'
- 
-   MozDescribeCodeAddress(aPC, &details);
--  MozFormatCodeAddressDetails(buf, sizeof(buf), aFrameNumber, aPC, &details);
--  fprintf(stream, "%s\n", buf);
-+  MozFormatCodeAddressDetails(buf, buflen, aFrameNumber, aPC, &details);
-+  size_t len = std::min(strlen(buf), buflen + 1 - 2);
-+  buf[len++] = '\n';
-+  buf[len] = '\0';
-   fflush(stream);
-+  EnsureWrite(stream, buf, len);
- }
- 
- static void
- PrintStackFrameCached(uint32_t aFrameNumber, void* aPC, void* aSP,
-                       void* aClosure)
- {
-   auto stream = static_cast<FILE*>(aClosure);
-   static const size_t buflen = 1024;
--  char buf[buflen];
--  gCodeAddressService->GetLocation(aFrameNumber, aPC, buf, buflen);
--  fprintf(stream, "    %s\n", buf);
-+  char buf[buflen + 5] = "    ";  // 5 for leading "    " and trailing '\n'
-+  gCodeAddressService->GetLocation(aFrameNumber, aPC, buf + 4, buflen);
-+  size_t len = std::min(strlen(buf), buflen + 5 - 2);
-+  buf[len++] = '\n';
-+  buf[len] = '\0';
-   fflush(stream);
-+  EnsureWrite(stream, buf, len);
- }
- 
- static void
- RecordStackFrame(uint32_t /*aFrameNumber*/, void* aPC, void* /*aSP*/,
-                  void* aClosure)
- {
-   auto locations = static_cast<std::vector<void*>*>(aClosure);
-   locations->push_back(aPC);

comm-esr60/mozilla-esr60/patches/1485224-2-64a1.patch

@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Masatoshi Kimura <VYV03354@nifty.ne.jp>
-# Date 1535467299 -32400
-# Node ID 815d17af6a7e0277bc0c6c60bf745cc2ef425a2b
-# Parent  3a10f1ee568b0a0643cf04b531d80d1cfb1b4afb
-Bug 1485224 - Workaround a linker bug of MSVC 2017 Update 8. r=glandium
-
-MSVC 15.8 linker dislikes forward slashes in the /OUT: parameter when it is generating a profile
-
-diff --git a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -564,25 +564,32 @@ distclean::
- alltags:
- 	$(RM) TAGS
- 	find $(topsrcdir) -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' -o -name '*.idl' \) -print | $(TAG_PROGRAM)
- 
- define EXPAND_CC_OR_CXX
- $(if $(PROG_IS_C_ONLY_$(1)),$(EXPAND_CC),$(EXPAND_CCC))
- endef
- 
-+# Workaround a bug of MSVC 2017 Update 8 (see bug 1485224)
-+ifeq ($(CC_TYPE)_$(HOST_OS_ARCH)_$(MOZ_PROFILE_GENERATE),msvc_WINNT_1)
-+LINKER_OUT=$(subst /,\,$1)
-+else
-+LINKER_OUT=$1
-+endif
-+
- #
- # PROGRAM = Foo
- # creates OBJS, links with LIBS to create Foo
- #
- $(PROGRAM): $(PROGOBJS) $(STATIC_LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)
- 	$(REPORT_BUILD)
- 	@$(RM) $@.manifest
- ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
--	$(EXPAND_LINK) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_LIBS) $(OS_LIBS)
-+	$(EXPAND_LINK) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_LIBS) $(OS_LIBS)
- ifdef MSMANIFEST_TOOL
- 	@if test -f $@.manifest; then \
- 		if test -f '$(srcdir)/$@.manifest'; then \
- 			echo 'Embedding manifest from $(srcdir)/$@.manifest and $@.manifest'; \
- 			$(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$@.manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
- 		else \
- 			echo 'Embedding manifest from $@.manifest'; \
- 			$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \

comm-esr60/mozilla-esr60/patches/series

@@ -217,19 +217,10 @@ NOBUG-BACKOUT-1439860-60.patch
 TOP-9999999-rust133-257.patch
 TOP-9999999-fixlangpack-257.patch
 mozilla-esr60-top-nonexisting.patch
-1485224-1-64a1.patch
-1485224-2-64a1.patch
-1485224-3-64a1.patch
-1482196-64a1.patch
-1490654-64a1.patch
-1394825-67a1.patch
-1546693-68a1.patch
-1557547-68.patch
 1429016-67a1.patch
 1591803-1only-72a1.patch
 PARTLY-1445766-61a1.patch
 1584803-version-beta1.patch
-1483835-63a1.patch
 1515550-66a1.patch
 1515528-66a1.patch
 1522560-66a1.patch

rel-257/mozilla-esr60/patches/1253064-62a1.patch

@@ -0,0 +1,140 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1527729370 -32400
+# Node ID 07db1154d5b9411004d33cfe5d6a0e842cf15163
+# Parent  e6f9ab6fcbbbcb976df385fc203d7bc81666c065
+Bug 1253064 - Prefer Clang to GCC in local developer builds. r=gps
+
+For Android targets, we just ignore plain clang, it's unlikely to work.
+
+diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
+--- a/build/moz.configure/toolchain.configure
++++ b/build/moz.configure/toolchain.configure
+@@ -1,14 +1,31 @@
+ # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+ # vim: set filetype=python:
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
++imply_option('--enable-release', mozilla_official)
++imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True))
++
++js_option('--enable-release',
++          help='Build with more conservative, release engineering-oriented '
++               'options. This may slow down builds.')
++
++
++@depends('--enable-release')
++def developer_options(value):
++    if not value:
++        return True
++
++
++add_old_configure_assignment('DEVELOPER_OPTIONS', developer_options)
++set_config('DEVELOPER_OPTIONS', developer_options)
++
+ # PGO
+ # ==============================================================
+ js_option(env='MOZ_PGO', help='Build with profile guided optimizations')
+ 
+ set_config('MOZ_PGO', depends('MOZ_PGO')(lambda x: bool(x)))
+ add_old_configure_assignment('MOZ_PGO', depends('MOZ_PGO')(lambda x: bool(x)))
+ 
+ # Code optimization
+@@ -642,31 +659,35 @@ def toolchain_search_path(vc_compiler_pa
+ def default_c_compilers(host_or_target):
+     '''Template defining the set of default C compilers for the host and
+     target platforms.
+     `host_or_target` is either `host` or `target` (the @depends functions
+     from init.configure.
+     '''
+     assert host_or_target in (host, target)
+ 
+-    @depends(host_or_target, target, toolchain_prefix, android_clang_compiler)
+-    def default_c_compilers(host_or_target, target, toolchain_prefix, android_clang_compiler):
++    @depends(host_or_target, target, toolchain_prefix, android_clang_compiler,
++             developer_options)
++    def default_c_compilers(host_or_target, target, toolchain_prefix,
++                            android_clang_compiler, developer_options):
+         gcc = ('gcc',)
+         if toolchain_prefix and host_or_target is target:
+             gcc = tuple('%sgcc' % p for p in toolchain_prefix) + gcc
+         # Android sets toolchain_prefix and android_clang_compiler, but
+         # we want the latter to take precedence, because the latter can
+         # point at clang, which is what we want to use.
+         if android_clang_compiler and host_or_target is target:
+-            gcc = (android_clang_compiler,) + gcc
++            return (android_clang_compiler,) + gcc
+ 
+         if host_or_target.kernel == 'WINNT':
+             return ('cl', 'clang-cl') + gcc + ('clang',)
+         if host_or_target.kernel == 'Darwin':
+             return ('clang',)
++        if developer_options:
++            return ('clang',) + gcc
+         return gcc + ('clang',)
+ 
+     return default_c_compilers
+ 
+ 
+ @template
+ def default_cxx_compilers(c_compiler):
+     '''Template defining the set of default C++ compilers for the host and
+@@ -1371,34 +1392,16 @@ imply_option('--enable-pie', depends_if(
+ # ==============================================================
+ 
+ option(env='RUSTFLAGS',
+        nargs=1,
+        help='Rust compiler flags')
+ set_config('RUSTFLAGS', depends('RUSTFLAGS')(lambda flags: flags))
+ 
+ 
+-imply_option('--enable-release', mozilla_official)
+-imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True))
+-
+-js_option('--enable-release',
+-          default=milestone.is_release_or_beta,
+-          help='Build with more conservative, release engineering-oriented '
+-               'options. This may slow down builds.')
+-
+-
+-@depends('--enable-release')
+-def developer_options(value):
+-    if not value:
+-        return True
+-
+-
+-add_old_configure_assignment('DEVELOPER_OPTIONS', developer_options)
+-set_config('DEVELOPER_OPTIONS', developer_options)
+-
+ # Rust compiler flags
+ # ==============================================================
+ 
+ js_option(env='RUSTC_OPT_LEVEL',
+           nargs=1,
+           help='Rust compiler optimization level (-C opt-level=%s)')
+ 
+ # --enable-release kicks in full optimizations.
+diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+@@ -351,16 +351,18 @@ class BaseToolchainTest(BaseConfigureTes
+           they can be omitted. Likewise for host_cxx_compiler vs.
+           cxx_compiler.
+         '''
+         environ = dict(environ)
+         if 'PATH' not in environ:
+             environ['PATH'] = os.pathsep.join(
+                 mozpath.abspath(p) for p in ('/bin', '/usr/bin'))
+ 
++        args = args + ['--enable-release']
++
+         sandbox = self.get_sandbox(paths, {}, args, environ,
+                                    logger=self.logger)
+ 
+         for var in ('c_compiler', 'cxx_compiler', 'host_c_compiler',
+                     'host_cxx_compiler'):
+             if var in results:
+                 result = results[var]
+             elif var.startswith('host_'):

comm-esr60/mozilla-esr60/patches/1394825-67a1.patch → rel-257/mozilla-esr60/patches/1394825-67a1.patch

@@ -1,8 +1,8 @@
 # HG changeset patch
-# User Emilio Cobos Alvarez <emilio@crisal.io>
+# User Emilio Cobos Álvarez <emilio@crisal.io>
 # Date 1549767373 0
 # Node ID d6a02521683879d28e94e2912c09fcec1645d2f3
-# Parent  302e913c26ab6c054a43039617953dd505baefe7
+# Parent  28f5b496307d590bcafa0514135872b4886ece2e
 Bug 1394825 - Update minimum clang version to 4.0. r=glandium
 
 libclang 3.9 has a bug that makes bindgen unable to distinguish some typedefs
@@ -23,19 +23,19 @@ rename from build/build-clang/clang-3.9-linux64.json
 rename to build/build-clang/clang-4.0-linux64.json
 --- a/build/build-clang/clang-3.9-linux64.json
 +++ b/build/build-clang/clang-4.0-linux64.json
-@@ -1,23 +1,18 @@
+@@ -1,24 +1,18 @@
  {
--    "llvm_revision": "290136",
+-    "llvm_revision": "289595",
 +    "llvm_revision": "305830",
      "stages": "3",
      "build_libcxx": true,
      "build_type": "Release",
      "assertions": false,
--    "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_390/final",
--    "clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_390/final",
--    "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_390/final",
--    "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_390/final",
--    "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_390/final",
+-    "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_391/final",
+-    "clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_391/final",
+-    "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_391/final",
+-    "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_391/final",
+-    "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_391/final",
 +    "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_401/final",
 +    "clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_401/final",
 +    "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_401/final",
@@ -50,7 +50,8 @@ rename to build/build-clang/clang-4.0-linux64.json
 -      "llvm-debug-frame.patch",
 -      "r277806.patch",
 -      "r285657.patch",
--      "r313872-for-3.9.patch"
+-      "r289565-for-3.9.patch",
+-      "r313872.patch"
 -    ]
 +    "patches": []
  }

rel-257/mozilla-esr60/patches/1467041-62a1.patch

@@ -0,0 +1,39 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1528269189 -32400
+# Node ID 9f71934b98492b939856aafaad37bca20e2c0d11
+# Parent  8dba09f99f328cfabf6e644c88d5b7452856f04c
+Bug 1467041 - Default to --enable-release when milestone is beta/release. r=froydnj
+
+--enable-release not being passed means developer options are enabled,
+which is generally speaking not desirable for builds meant to be
+shipped. This is somewhat alleviated for Firefox by MOZILLA_OFFICIAL
+implying --enable-release (as well as MOZ_AUTOMATION), but that doesn't
+apply to e.g. standalone js builds (even some of the standalone js jobs
+on our automation don't set MOZ_AUTOMATION for some reason).
+
+A reasonable thing to do is just to default builds for release/beta
+milestones to --enable-release, but still allow --disable-release
+to enable the developer options.
+
+diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
+--- a/build/moz.configure/toolchain.configure
++++ b/build/moz.configure/toolchain.configure
+@@ -3,16 +3,17 @@
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ imply_option('--enable-release', mozilla_official)
+ imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True))
+ 
+ js_option('--enable-release',
++          default=milestone.is_release_or_beta,
+           help='Build with more conservative, release engineering-oriented '
+                'options. This may slow down builds.')
+ 
+ 
+ @depends('--enable-release')
+ def developer_options(value):
+     if not value:
+         return True

comm-esr60/mozilla-esr60/patches/1482196-64a1.patch → rel-257/mozilla-esr60/patches/1482196-64a1.patch

@@ -2,13 +2,13 @@
 # User Robert Longson <longsonr@gmail.com>
 # Date 1536602347 -3600
 # Node ID 0d87c14de6f50535e04f59fcfdd6b4dbdfc6705d
-# Parent  4dcc6b76360652ac3fc947bc77e2233bb43cd1b0
+# Parent  17b481b97dec785d41fd851a56d8567c7f2dd45e
 Bug 1482196 - Increase minimum clang version to 3.9 r=froydnj
 
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -347,32 +347,32 @@ def get_compiler_info(compiler, language
+@@ -365,32 +365,32 @@ def get_compiler_info(compiler, language
      '''
      # Note: MSVC doesn't expose __STDC_VERSION__. It does expose __STDC__,
      # but only when given the -Za option, which disables compiler
@@ -43,7 +43,7 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
          #endif
  
          #if __cplusplus
-@@ -868,20 +868,20 @@ def compiler(language, host_or_target, c
+@@ -908,20 +908,20 @@ def compiler(language, host_or_target, c
                  raise FatalCheckError('GCC is not supported on Android.\n'
                                        'Please use clang from the Android NDK instead.')
              if info.version < '6.1.0':
@@ -92,7 +92,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
  
  def CLANG_PLATFORM(gcc_platform):
      base = {
-@@ -481,17 +481,17 @@ class LinuxToolchainTest(BaseToolchainTe
+@@ -483,17 +483,17 @@ class LinuxToolchainTest(BaseToolchainTe
  
      CLANG_3_3_RESULT = CompilerResult(
          flags=[],

comm-esr60/mozilla-esr60/patches/1483835-63a1.patch → rel-257/mozilla-esr60/patches/1483835-63a1.patch

@@ -2,31 +2,31 @@
 # User David Major <dmajor@mozilla.com>
 # Date 1534865416 14400
 # Node ID 577ffed9f102439db47afebcef95bbaaa2e04c93
-# Parent  e82ddf572c866559b9447ac174ac663e81e7efa3
+# Parent  dc3e1623753f02039aa5b8dc5a6dace91497b6d8
 Bug 1483835: Default to clang-cl and lld-link in local Windows builds. r=glandium
 
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -641,17 +641,17 @@ def default_c_compilers(host_or_target):
- 
-     @depends(host_or_target, target, toolchain_prefix)
-     def default_c_compilers(host_or_target, target, toolchain_prefix):
-         gcc = ('gcc',)
-         if toolchain_prefix and host_or_target is target:
+@@ -674,17 +674,17 @@ def default_c_compilers(host_or_target):
              gcc = tuple('%sgcc' % p for p in toolchain_prefix) + gcc
+         # Android sets toolchain_prefix and android_clang_compiler, but
+         # we want the latter to take precedence, because the latter can
+         # point at clang, which is what we want to use.
+         if android_clang_compiler and host_or_target is target:
+             return (android_clang_compiler,) + gcc
  
          if host_or_target.kernel == 'WINNT':
 -            return ('cl', 'clang-cl') + gcc + ('clang',)
 +            return ('clang-cl', 'cl') + gcc + ('clang',)
          if host_or_target.kernel == 'Darwin':
              return ('clang',)
+         if developer_options:
+             return ('clang',) + gcc
          return gcc + ('clang',)
  
      return default_c_compilers
  
- 
- @template
 diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure
 --- a/build/moz.configure/windows.configure
 +++ b/build/moz.configure/windows.configure
@@ -53,32 +53,31 @@ diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows
 diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
 +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-@@ -928,18 +928,23 @@ class WindowsToolchainTest(BaseToolchain
-     GXX_4_9_RESULT = LinuxToolchainTest.GXX_4_9_RESULT
-     GCC_5_RESULT = LinuxToolchainTest.GCC_5_RESULT
+@@ -962,17 +962,22 @@ class WindowsToolchainTest(BaseToolchain
      GXX_5_RESULT = LinuxToolchainTest.GXX_5_RESULT
      GCC_6_RESULT = LinuxToolchainTest.GCC_6_RESULT
      GXX_6_RESULT = LinuxToolchainTest.GXX_6_RESULT
      DEFAULT_GCC_RESULT = LinuxToolchainTest.DEFAULT_GCC_RESULT
      DEFAULT_GXX_RESULT = LinuxToolchainTest.DEFAULT_GXX_RESULT
  
--    # VS2017u6 or greater is required.
-+    # VS2017u8 or greater is required.
+     # VS2017u6 or greater is required.
      def test_msvc(self):
+-        self.do_toolchain_test(self.PATHS, {
 +        # We'll pick msvc if clang-cl can't be found.
 +        paths = {
 +            k: v for k, v in self.PATHS.iteritems()
 +            if os.path.basename(k) != 'clang-cl'
 +        }
-         self.do_toolchain_test(paths, {
-             'c_compiler': self.VS_2017u8_RESULT,
-             'cxx_compiler': self.VSXX_2017u8_RESULT,
++        self.do_toolchain_test(paths, {
+             'c_compiler': self.VS_2017u6_RESULT,
+             'cxx_compiler': self.VSXX_2017u6_RESULT,
          })
  
      def test_unsupported_msvc(self):
          self.do_toolchain_test(self.PATHS, {
-             'c_compiler': self.VS_2017u6_RESULT,
-@@ -985,22 +990,17 @@ class WindowsToolchainTest(BaseToolchain
+             'c_compiler': self.VS_2017u4_RESULT,
+         }, environ={
+@@ -1011,22 +1016,17 @@ class WindowsToolchainTest(BaseToolchain
  
          self.do_toolchain_test(self.PATHS, {
              'c_compiler': self.VS_2013u2_RESULT,

comm-esr60/mozilla-esr60/patches/1485224-3-64a1.patch → rel-257/mozilla-esr60/patches/1485224-3Only-64a1.patch

@@ -2,19 +2,19 @@
 # User Masatoshi Kimura <VYV03354@nifty.ne.jp>
 # Date 1536272119 -32400
 # Node ID b2a536ba5d4bbf0be909652caee1d2d4d63ddcb4
-# Parent  49f6ff9787d3fe9441c5bd7c5d1a3a0956ff1d9a
+# Parent  8b53d0af4dfeaf957cecbc5180f1d1a8f0fb2128
 Bug 1485224 - Update Windows builders to VS 2017 15.8.4 and Windows SDK 17134. r=glandium
 
 diff --git a/browser/config/tooltool-manifests/win32/releng.manifest b/browser/config/tooltool-manifests/win32/releng.manifest
 --- a/browser/config/tooltool-manifests/win32/releng.manifest
 +++ b/browser/config/tooltool-manifests/win32/releng.manifest
-@@ -9,21 +9,21 @@
-     "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
-     "size": 97017057,
-     "digest": "b726645f9d26c5a3048720b3839166021c1cf91a02d2ff2f10c49adced7455c7352e18b5052084d80bf9d1c40ec1bf72d0397921b8cd23262f89fdbd10def58f",
+@@ -1,21 +1,21 @@
+ [
+   {
+     "size": 266240,
+     "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
      "algorithm": "sha512",
-     "filename": "rustc.tar.bz2",
-     "unpack": true
+     "filename": "mozmake.exe"
    },
    {
 -    "version": "Visual Studio 2017 15.6.6 / SDK 10.0.15063.0",
@@ -37,13 +37,13 @@ diff --git a/browser/config/tooltool-manifests/win32/releng.manifest b/browser/c
 diff --git a/browser/config/tooltool-manifests/win64/releng.manifest b/browser/config/tooltool-manifests/win64/releng.manifest
 --- a/browser/config/tooltool-manifests/win64/releng.manifest
 +++ b/browser/config/tooltool-manifests/win64/releng.manifest
-@@ -10,21 +10,21 @@
-     "size": 103602526,
-     "digest": "558d2d18991ad8b250a5d6b46a55e1ffdffc50d6bdd9cb4b3a945dd3d1143836b32e47f1df612bfea97ca2c02333ed43055b6c3030ecb1632385fb6940c1d246",
+@@ -1,21 +1,21 @@
+ [
+   {
+     "size": 266240,
+     "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
      "algorithm": "sha512",
-     "visibility": "public",
-     "filename": "rustc.tar.bz2",
-     "unpack": true
+     "filename": "mozmake.exe"
    },
    {
 -    "version": "Visual Studio 2017 15.6.6 / SDK 10.0.15063.0",
@@ -88,7 +88,7 @@ diff --git a/build/docs/toolchains.rst b/build/docs/toolchains.rst
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -495,18 +495,18 @@ def check_compiler(compiler, language, t
+@@ -513,18 +513,18 @@ def check_compiler(compiler, language, t
      if info.language == 'C++':
          if info.type == 'clang' and info.language_version != cxx14_version:
              append_flag('-std=gnu++14')
@@ -146,7 +146,7 @@ diff --git a/build/win32/mozconfig.vs2017 b/build/win32/mozconfig.vs2017
  mk_export_correct_style WINDOWSSDKDIR
  mk_export_correct_style WIN32_REDIST_DIR
  mk_export_correct_style WIN_UCRT_REDIST_DIR
- mk_export_correct_style PATH
+ mk_export_correct_style WIN_DIA_SDK_BIN_DIR
 diff --git a/build/win64/mozconfig.vs2017 b/build/win64/mozconfig.vs2017
 --- a/build/win64/mozconfig.vs2017
 +++ b/build/win64/mozconfig.vs2017
@@ -302,7 +302,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
  LIBRARY_NAME_INFOS = {
      'linux-gnu': {
          'DLL_PREFIX': 'lib',
-@@ -862,17 +863,18 @@ class WindowsToolchainTest(BaseToolchain
+@@ -864,17 +865,18 @@ class WindowsToolchainTest(BaseToolchain
      PATHS = {
          '/opt/VS_2013u2/bin/cl': VS_2013u2 + VS_PLATFORM_X86,
          '/opt/VS_2013u3/bin/cl': VS_2013u3 + VS_PLATFORM_X86,
@@ -322,7 +322,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
          '/usr/bin/gcc-5': GCC_5 + GCC_PLATFORM_X86_WIN,
          '/usr/bin/g++-5': GXX_5 + GCC_PLATFORM_X86_WIN,
          '/usr/bin/gcc-6': GCC_6 + GCC_PLATFORM_X86_WIN,
-@@ -919,38 +921,52 @@ class WindowsToolchainTest(BaseToolchain
+@@ -921,38 +923,52 @@ class WindowsToolchainTest(BaseToolchain
          'This version (19.11.25547) of the MSVC compiler is not supported.\n'
          'You must install Visual C++ 2017 Update 6 or Update 8 or later'
          ' in order to build.\n'
@@ -380,21 +380,20 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
      CLANGXX_3_3_RESULT = LinuxToolchainTest.CLANGXX_3_3_RESULT
      DEFAULT_CLANG_RESULT = LinuxToolchainTest.DEFAULT_CLANG_RESULT
      DEFAULT_CLANGXX_RESULT = LinuxToolchainTest.DEFAULT_CLANGXX_RESULT
-@@ -960,19 +976,27 @@ class WindowsToolchainTest(BaseToolchain
-     GXX_5_RESULT = LinuxToolchainTest.GXX_5_RESULT
-     GCC_6_RESULT = LinuxToolchainTest.GCC_6_RESULT
-     GXX_6_RESULT = LinuxToolchainTest.GXX_6_RESULT
-     DEFAULT_GCC_RESULT = LinuxToolchainTest.DEFAULT_GCC_RESULT
-     DEFAULT_GXX_RESULT = LinuxToolchainTest.DEFAULT_GXX_RESULT
- 
+@@ -968,18 +984,26 @@ class WindowsToolchainTest(BaseToolchain
      # VS2017u6 or greater is required.
      def test_msvc(self):
-+        self.do_toolchain_test(paths, {
+         # We'll pick msvc if clang-cl can't be found.
+         paths = {
+             k: v for k, v in self.PATHS.iteritems()
+             if os.path.basename(k) != 'clang-cl'
+         }
+         self.do_toolchain_test(paths, {
 +            'c_compiler': self.VS_2017u8_RESULT,
 +            'cxx_compiler': self.VSXX_2017u8_RESULT,
 +        })
 +
-         self.do_toolchain_test(self.PATHS, {
++        self.do_toolchain_test(self.PATHS, {
              'c_compiler': self.VS_2017u6_RESULT,
              'cxx_compiler': self.VSXX_2017u6_RESULT,
 +        }, environ={
@@ -408,7 +407,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
          }, environ={
              'CC': '/opt/VS_2017u4/bin/cl',
          })
-@@ -1061,17 +1085,17 @@ class WindowsToolchainTest(BaseToolchain
+@@ -1063,17 +1087,17 @@ class WindowsToolchainTest(BaseToolchain
              'cxx_compiler': self.CLANGXX_3_3_RESULT,
          }, environ={
              'CC': 'clang-3.3',
@@ -427,7 +426,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
  
  
  class Windows64ToolchainTest(WindowsToolchainTest):
-@@ -1082,17 +1106,18 @@ class Windows64ToolchainTest(WindowsTool
+@@ -1084,17 +1108,18 @@ class Windows64ToolchainTest(WindowsTool
      PATHS = {
          '/opt/VS_2013u2/bin/cl': VS_2013u2 + VS_PLATFORM_X86_64,
          '/opt/VS_2013u3/bin/cl': VS_2013u3 + VS_PLATFORM_X86_64,
@@ -447,7 +446,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
          '/usr/bin/gcc-5': GCC_5 + GCC_PLATFORM_X86_64_WIN,
          '/usr/bin/g++-5': GXX_5 + GCC_PLATFORM_X86_64_WIN,
          '/usr/bin/gcc-6': GCC_6 + GCC_PLATFORM_X86_64_WIN,
-@@ -1104,17 +1129,17 @@ class Windows64ToolchainTest(WindowsTool
+@@ -1106,17 +1131,17 @@ class Windows64ToolchainTest(WindowsTool
          '/usr/bin/clang-3.6': CLANG_3_6 + CLANG_PLATFORM_X86_64_WIN,
          '/usr/bin/clang++-3.6': CLANGXX_3_6 + CLANG_PLATFORM_X86_64_WIN,
          '/usr/bin/clang-3.3': CLANG_3_3 + CLANG_PLATFORM_X86_64_WIN,

comm-esr60/mozilla-esr60/patches/1490654-64a1.patch → rel-257/mozilla-esr60/patches/1490654-64a1.patch

@@ -2,13 +2,13 @@
 # User Masatoshi Kimura <VYV03354@nifty.ne.jp>
 # Date 1537104151 -32400
 # Node ID aa0aed5cb50387ed294b747e201b62f35c275929
-# Parent  42987e23c9de4a592083c451c90c57aa89cdea18
+# Parent  02a9a021966c296384cf7791bee35b79624ef241
 Bug 1490654 - Drop support for MSVC 2017 Update 6. r=froydnj
 
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -874,33 +874,22 @@ def compiler(language, host_or_target, c
+@@ -914,33 +914,22 @@ def compiler(language, host_or_target, c
  
          # If you want to bump the version check here search for
          # builtin_bitreverse8 above, and see the associated comment.
@@ -48,7 +48,7 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
 diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
 +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-@@ -882,65 +882,28 @@ class WindowsToolchainTest(BaseToolchain
+@@ -884,65 +884,28 @@ class WindowsToolchainTest(BaseToolchain
          '/usr/bin/clang': DEFAULT_CLANG + CLANG_PLATFORM_X86_WIN,
          '/usr/bin/clang++': DEFAULT_CLANGXX + CLANG_PLATFORM_X86_WIN,
          '/usr/bin/clang-3.6': CLANG_3_6 + CLANG_PLATFORM_X86_WIN,
@@ -125,10 +125,10 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
          language='C',
      )
      VSXX_2017u8_RESULT = CompilerResult(
-@@ -981,25 +944,23 @@ class WindowsToolchainTest(BaseToolchain
- 
-     # VS2017u6 or greater is required.
-     def test_msvc(self):
+@@ -988,25 +951,23 @@ class WindowsToolchainTest(BaseToolchain
+             k: v for k, v in self.PATHS.iteritems()
+             if os.path.basename(k) != 'clang-cl'
+         }
          self.do_toolchain_test(paths, {
              'c_compiler': self.VS_2017u8_RESULT,
              'cxx_compiler': self.VSXX_2017u8_RESULT,

comm-esr60/mozilla-esr60/patches/1546693-68a1.patch → rel-257/mozilla-esr60/patches/1546693-68a1.patch

@@ -2,7 +2,7 @@
 # User Nathan Froyd <froydnj@mozilla.com>
 # Date 1556119479 0
 # Node ID 85d2f662a256e7176adc6d9c64689fabafea4a60
-# Parent  126329cbed86a74f0c17f092d2c8f2b0f80d17c3
+# Parent  9f57119e76fa71e1c52a7f050913a12e0c07d174
 Bug 1546693 - remove vs2015 manifests; r=RyanVM
 
 We no longer build anything with VS 2015.
@@ -13,7 +13,7 @@ diff --git a/browser/config/tooltool-manifests/win32/vs2015.manifest b/browser/c
 deleted file mode 100644
 --- a/browser/config/tooltool-manifests/win32/vs2015.manifest
 +++ /dev/null
-@@ -1,41 +0,0 @@
+@@ -1,25 +0,0 @@
 -[
 -  {
 -    "size": 266240,
@@ -22,14 +22,6 @@ deleted file mode 100644
 -    "filename": "mozmake.exe"
 -  },
 -  {
--    "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
--    "size": 97017057,
--    "digest": "b726645f9d26c5a3048720b3839166021c1cf91a02d2ff2f10c49adced7455c7352e18b5052084d80bf9d1c40ec1bf72d0397921b8cd23262f89fdbd10def58f",
--    "algorithm": "sha512",
--    "filename": "rustc.tar.bz2",
--    "unpack": true
--  },
--  {
 -    "version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
 -    "size": 326656969,
 -    "digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
@@ -45,21 +37,13 @@ deleted file mode 100644
 -    "unpack": true,
 -    "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
 -    "size": 297118
--  },
--  {
--    "version": "clang 5.0pre/r293859",
--    "size": 309009013,
--    "digest": "cd3ed31acefd185f441632158dde73538c62bab7ebf2a8ec630985ab345938ec522983721ddb1bead1de22d5ac1571d50a958ae002364d739f2a78c6e7244222",
--    "algorithm": "sha512",
--    "filename": "clang.tar.bz2",
--    "unpack": true
 -  }
 -]
 diff --git a/browser/config/tooltool-manifests/win64/vs2015.manifest b/browser/config/tooltool-manifests/win64/vs2015.manifest
 deleted file mode 100644
 --- a/browser/config/tooltool-manifests/win64/vs2015.manifest
 +++ /dev/null
-@@ -1,42 +0,0 @@
+@@ -1,25 +0,0 @@
 -[
 -  {
 -    "size": 266240,
@@ -68,15 +52,6 @@ deleted file mode 100644
 -    "filename": "mozmake.exe"
 -  },
 -  {
--    "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
--    "size": 103602526,
--    "digest": "558d2d18991ad8b250a5d6b46a55e1ffdffc50d6bdd9cb4b3a945dd3d1143836b32e47f1df612bfea97ca2c02333ed43055b6c3030ecb1632385fb6940c1d246",
--    "algorithm": "sha512",
--    "visibility": "public",
--    "filename": "rustc.tar.bz2",
--    "unpack": true
--  },
--  {
 -    "version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
 -    "size": 326656969,
 -    "digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
@@ -92,13 +67,5 @@ deleted file mode 100644
 -    "unpack": true,
 -    "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
 -    "size": 297118
--  },
--  {
--    "version": "clang 5.0pre/r293859",
--    "size": 313862839,
--    "digest": "44dee70d525ea93952af27f943d1cc773311970c31d971d2bc2e3437cce0c899f3a03ddd8e42e86f1b4fd9ab1c4bc1767cdb0406eb4b3934ae4fc272dab830dc",
--    "algorithm": "sha512",
--    "filename": "clang.tar.bz2",
--    "unpack": true
 -  }
 -]

comm-esr60/mozilla-esr60/patches/1557547-68.patch → rel-257/mozilla-esr60/patches/1557547-69a1.patch

@@ -1,9 +1,9 @@
 # HG changeset patch
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1560378144 0
-# Node ID 4c1dcf5efb3f97fd2470034b154e4aa2ea498b39
-# Parent  782660400d8f6cc08ef3e4c365ca7ebdc7db637d
-Bug 1557547 - Actively reject clang < 4.0 during configure. r=mshal, a=RyanVM
+# Node ID 4778e168c9acc7a7400efbe01d12500e8032db87
+# Parent  96556f7187cddb0971c7e37124056e052115f081
+Bug 1557547 - Actively reject clang < 4.0 during configure. r=mshal
 
 Bug 1394825 bumped the minimum version of clang we use on automation,
 for the base toolchain jobs, and there's a libclang test for bindgen,
@@ -19,7 +19,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D34083
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -347,32 +347,32 @@ def get_compiler_info(compiler, language
+@@ -365,32 +365,32 @@ def get_compiler_info(compiler, language
      '''
      # Note: MSVC doesn't expose __STDC_VERSION__. It does expose __STDC__,
      # but only when given the -Za option, which disables compiler
@@ -57,7 +57,8 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
          #endif
  
          #if __cplusplus
-@@ -869,19 +869,20 @@ def compiler(language, host_or_target, c
+@@ -908,20 +908,20 @@ def compiler(language, host_or_target, c
+                 raise FatalCheckError('GCC is not supported on Android.\n'
                                        'Please use clang from the Android NDK instead.')
              if info.version < '6.1.0':
                  raise FatalCheckError(
@@ -65,7 +66,7 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
                      % info.version)
  
          # If you want to bump the version check here search for
-         # builtin_bitreverse8 above, and see the associated comment.
+-        # builtin_bitreverse8 above, and see the associated comment.
 +        # diagnose_if above, and see the associated comment.
          if info.type == 'clang' and not info.version:
              raise FatalCheckError(
@@ -117,7 +118,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
          '--target=x86_64-darwin11.2.0': GCC_PLATFORM_X86_64_OSX[None],
          '--target=i686-linux-gnu': GCC_PLATFORM_X86_LINUX[None],
          '--target=i686-darwin11.2.0': GCC_PLATFORM_X86_OSX[None],
-@@ -431,18 +428,18 @@ class LinuxToolchainTest(BaseToolchainTe
+@@ -433,18 +430,18 @@ class LinuxToolchainTest(BaseToolchainTe
          '/usr/bin/gcc-5': GCC_5 + GCC_PLATFORM_X86_64_LINUX,
          '/usr/bin/g++-5': GXX_5 + GCC_PLATFORM_X86_64_LINUX,
          '/usr/bin/gcc-6': GCC_6 + GCC_PLATFORM_X86_64_LINUX,
@@ -138,7 +139,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
      GXX_4_7_RESULT = GCC_4_7_RESULT
      GCC_4_9_RESULT = old_gcc_message('4.9.3')
      GXX_4_9_RESULT = GCC_4_9_RESULT
-@@ -474,40 +471,34 @@ class LinuxToolchainTest(BaseToolchainTe
+@@ -476,40 +473,34 @@ class LinuxToolchainTest(BaseToolchainTe
          version='7.3.0',
          type='gcc',
          compiler='/usr/bin/g++-7',
@@ -191,7 +192,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
              'cxx_compiler': self.DEFAULT_GXX_RESULT,
          })
  
-@@ -614,20 +605,20 @@ class LinuxToolchainTest(BaseToolchainTe
+@@ -616,20 +607,20 @@ class LinuxToolchainTest(BaseToolchainTe
          self.do_toolchain_test(paths, {
              'c_compiler': self.DEFAULT_CLANG_RESULT,
              'cxx_compiler': self.DEFAULT_CLANGXX_RESULT,
@@ -215,7 +216,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
              'c_compiler': self.CLANG_3_3_RESULT,
              'cxx_compiler': self.CLANGXX_3_3_RESULT,
          }, environ={
-@@ -790,18 +781,18 @@ class OSXToolchainTest(BaseToolchainTest
+@@ -792,18 +783,18 @@ class OSXToolchainTest(BaseToolchainTest
      HOST = 'x86_64-apple-darwin11.2.0'
      PATHS = {
          '/usr/bin/gcc-5': GCC_5 + GCC_PLATFORM_X86_64_OSX,
@@ -236,7 +237,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
      DEFAULT_CLANG_RESULT = LinuxToolchainTest.DEFAULT_CLANG_RESULT
      DEFAULT_CLANGXX_RESULT = LinuxToolchainTest.DEFAULT_CLANGXX_RESULT
      GCC_5_RESULT = LinuxToolchainTest.GCC_5_RESULT
-@@ -876,18 +867,18 @@ class WindowsToolchainTest(BaseToolchain
+@@ -878,18 +869,18 @@ class WindowsToolchainTest(BaseToolchain
          '/usr/bin/gcc-4.9': GCC_4_9 + GCC_PLATFORM_X86_WIN,
          '/usr/bin/g++-4.9': GXX_4_9 + GCC_PLATFORM_X86_WIN,
          '/usr/bin/gcc-5': GCC_5 + GCC_PLATFORM_X86_WIN,
@@ -257,7 +258,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
          'This version (%s) of the MSVC compiler is not supported.\nYou must'
          ' install Visual C++ 2017 Update 8 or later in order to build.\n'
          'See https://developer.mozilla.org/en/Windows_Build_Prerequisites')
-@@ -1082,18 +1073,18 @@ class Windows64ToolchainTest(WindowsTool
+@@ -1084,18 +1075,18 @@ class Windows64ToolchainTest(WindowsTool
          '/usr/bin/gcc-5': GCC_5 + GCC_PLATFORM_X86_64_WIN,
          '/usr/bin/g++-5': GXX_5 + GCC_PLATFORM_X86_64_WIN,
          '/usr/bin/gcc-6': GCC_6 + GCC_PLATFORM_X86_64_WIN,

rel-257/mozilla-esr60/patches/series

@@ -95,3 +95,12 @@ NOBUG-0c5f5c2e2a86-64a1.patch
 1484190-63a1.patch
 1453317-61a1.patch
 1457523-61a1.patch
+1253064-62a1.patch
+1467041-62a1.patch
+1483835-63a1.patch
+1485224-3Only-64a1.patch
+1482196-64a1.patch
+1490654-64a1.patch
+1394825-67a1.patch
+1546693-68a1.patch
+1557547-69a1.patch