Browse Source

Chronological shuffle for 57a1-67a1

Ian Neal 1 month ago
parent
commit
b8f9ea7162

+ 6 - 6
mozilla-release/patches/1079662-3-64a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1536208069 -32400
 # Date 1536208069 -32400
 # Node ID 3cbbfc5127e473345c8b0f040a0ed1b254d800ed
 # Node ID 3cbbfc5127e473345c8b0f040a0ed1b254d800ed
-# Parent  a6336b1624c36d4b7d9e096b8d2af34c8b9220d3
+# Parent  669c3aad5c2ada8471289e4f124fee7436b8ea69
 Bug 1079662 - Always enable PIE. r=froydnj
 Bug 1079662 - Always enable PIE. r=froydnj
 
 
 Last attempt, a few years ago, blatantly failed because nautilus (the
 Last attempt, a few years ago, blatantly failed because nautilus (the
@@ -180,7 +180,7 @@ diff --git a/browser/moz.configure b/browser/moz.configure
 diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
 diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
 --- a/build/autoconf/compiler-opts.m4
 --- a/build/autoconf/compiler-opts.m4
 +++ b/build/autoconf/compiler-opts.m4
 +++ b/build/autoconf/compiler-opts.m4
-@@ -170,39 +170,18 @@ if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -
+@@ -203,39 +203,18 @@ if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -
           if test "$GC_SECTIONS_BREAKS_DEBUG_RANGES" = no; then
           if test "$GC_SECTIONS_BREAKS_DEBUG_RANGES" = no; then
               DSO_LDOPTS="$DSO_LDOPTS -Wl,--gc-sections"
               DSO_LDOPTS="$DSO_LDOPTS -Wl,--gc-sections"
           fi
           fi
@@ -225,7 +225,7 @@ diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -195,17 +195,16 @@ def old_configure_options(*options):
+@@ -196,17 +196,16 @@ def old_configure_options(*options):
      '--enable-memory-sanitizer',
      '--enable-memory-sanitizer',
      '--enable-mobile-optimize',
      '--enable-mobile-optimize',
      '--enable-necko-wifi',
      '--enable-necko-wifi',
@@ -246,7 +246,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -1583,17 +1583,16 @@ def security_hardening_cflags(hardening_
+@@ -1553,17 +1553,16 @@ def security_hardening_cflags(hardening_
      return namespace(
      return namespace(
          flags=flags,
          flags=flags,
          js_flags=js_flags,
          js_flags=js_flags,
@@ -267,10 +267,10 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
 diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
 diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
 --- a/build/mozconfig.no-compile
 --- a/build/mozconfig.no-compile
 +++ b/build/mozconfig.no-compile
 +++ b/build/mozconfig.no-compile
-@@ -22,10 +22,11 @@ unset TOOLCHAIN_PREFIX
+@@ -21,10 +21,11 @@ unset MAKECAB
+ unset TOOLCHAIN_PREFIX
  unset BINDGEN_CFLAGS
  unset BINDGEN_CFLAGS
  unset LLVM_CONFIG
  unset LLVM_CONFIG
- unset LLVM_PROFDATA
  unset WIN64_LINK
  unset WIN64_LINK
  unset WIN64_LIB
  unset WIN64_LIB
  unset ENABLE_CLANG_PLUGIN
  unset ENABLE_CLANG_PLUGIN

+ 7 - 7
mozilla-release/patches/1399870-64a1.patch

@@ -2,7 +2,7 @@
 # User Ted Mielczarek <ted@mielczarek.org>
 # User Ted Mielczarek <ted@mielczarek.org>
 # Date 1537300219 14400
 # Date 1537300219 14400
 # Node ID 5b8dd6f38524a27b81bc39ed5f3224eebe3684ce
 # Node ID 5b8dd6f38524a27b81bc39ed5f3224eebe3684ce
-# Parent  67aba54e222739f7b503b8d305e490d838707548
+# Parent  dd1b9b6890119ffe8fca0b6fce890e74834e196d
 Bug 1399870 - make DEFFILE a Path instead of a string; r=gps
 Bug 1399870 - make DEFFILE a Path instead of a string; r=gps
 
 
 All but one of the current uses of DEFFILE use `SRCDIR + '/file.def'` to
 All but one of the current uses of DEFFILE use `SRCDIR + '/file.def'` to
@@ -189,12 +189,12 @@ diff --git a/modules/pdfium/moz.build b/modules/pdfium/moz.build
 diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
 diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
 --- a/mozglue/build/moz.build
 --- a/mozglue/build/moz.build
 +++ b/mozglue/build/moz.build
 +++ b/mozglue/build/moz.build
-@@ -17,17 +17,17 @@ if CONFIG['OS_TARGET'] == 'Android':
+@@ -22,17 +22,17 @@ if CONFIG['MOZ_ASAN']:
      ]
      ]
  
  
- if CONFIG['MOZ_ASAN']:
+ if CONFIG['MOZ_UBSAN']:
      SOURCES += [
      SOURCES += [
-         'AsanOptions.cpp',
+         'UbsanOptions.cpp',
      ]
      ]
  
  
  if CONFIG['OS_TARGET'] == 'WINNT':
  if CONFIG['OS_TARGET'] == 'WINNT':
@@ -211,7 +211,7 @@ diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
 diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
 diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
 --- a/python/mozbuild/mozbuild/frontend/context.py
 --- a/python/mozbuild/mozbuild/frontend/context.py
 +++ b/python/mozbuild/mozbuild/frontend/context.py
 +++ b/python/mozbuild/mozbuild/frontend/context.py
-@@ -1631,17 +1631,17 @@ VARIABLES = {
+@@ -1620,17 +1620,17 @@ VARIABLES = {
          """),
          """),
  
  
      'RCINCLUDE': (unicode, unicode,
      'RCINCLUDE': (unicode, unicode,
@@ -233,7 +233,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb
 diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
 diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
 --- a/python/mozbuild/mozbuild/frontend/emitter.py
 --- a/python/mozbuild/mozbuild/frontend/emitter.py
 +++ b/python/mozbuild/mozbuild/frontend/emitter.py
 +++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1040,17 +1040,16 @@ class TreeMetadataEmitter(LoggingMixin):
+@@ -1031,17 +1031,16 @@ class TreeMetadataEmitter(LoggingMixin):
          # them. We should aim to keep this set small because it violates the
          # them. We should aim to keep this set small because it violates the
          # desired abstraction of the build definition away from makefiles.
          # desired abstraction of the build definition away from makefiles.
          passthru = VariablePassthru(context)
          passthru = VariablePassthru(context)
@@ -251,7 +251,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozb
          for v in varlist:
          for v in varlist:
              if v in context and context[v]:
              if v in context and context[v]:
                  passthru.variables[v] = context[v]
                  passthru.variables[v] = context[v]
-@@ -1071,23 +1070,38 @@ class TreeMetadataEmitter(LoggingMixin):
+@@ -1062,23 +1061,38 @@ class TreeMetadataEmitter(LoggingMixin):
  
  
          for v in ['HOST_CXXFLAGS', 'HOST_CFLAGS']:
          for v in ['HOST_CXXFLAGS', 'HOST_CFLAGS']:
              if v in context and context[v]:
              if v in context and context[v]:

+ 0 - 0
mozilla-release/patches/1467658-2-62a1.patch → mozilla-release/patches/1467658-6-62a1.patch


+ 4 - 4
mozilla-release/patches/1474488-2only-64a1.patch

@@ -2,7 +2,7 @@
 # User Thomas P. <pdknsk+mozilla@gmail.com>
 # User Thomas P. <pdknsk+mozilla@gmail.com>
 # Date 1536634043 0
 # Date 1536634043 0
 # Node ID 75f0a4384b0f31f7356d4bb92bb6429ba82d281f
 # Node ID 75f0a4384b0f31f7356d4bb92bb6429ba82d281f
-# Parent  ff3405212698a96972d261c956452a006eaeecd5
+# Parent  4fe7d466918073adfc74ee7bcecc93767909c0cc
 Bug 1474488: add --enable-undefined-sanitizer with custom checks r=froydnj
 Bug 1474488: add --enable-undefined-sanitizer with custom checks r=froydnj
 
 
 diff --git a/build/autoconf/frameptr.m4 b/build/autoconf/frameptr.m4
 diff --git a/build/autoconf/frameptr.m4 b/build/autoconf/frameptr.m4
@@ -65,7 +65,7 @@ diff --git a/build/autoconf/sanitize.m4 b/build/autoconf/sanitize.m4
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -1497,16 +1497,36 @@ js_option('--enable-address-sanitizer', 
+@@ -1494,16 +1494,36 @@ js_option('--enable-address-sanitizer', 
  
  
  @depends_if('--enable-address-sanitizer')
  @depends_if('--enable-address-sanitizer')
  def asan(value):
  def asan(value):
@@ -105,7 +105,7 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
 diff --git a/config/rules.mk b/config/rules.mk
 diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
 +++ b/config/rules.mk
-@@ -980,23 +980,25 @@ cargo_linker_env_var := CARGO_TARGET_$(R
+@@ -983,23 +983,25 @@ cargo_linker_env_var := CARGO_TARGET_$(R
  # already works with the current setup) setup on Windows, and we don't
  # already works with the current setup) setup on Windows, and we don't
  # have to pass in any special linker options on Windows.
  # have to pass in any special linker options on Windows.
  ifneq (WINNT,$(OS_ARCH))
  ifneq (WINNT,$(OS_ARCH))
@@ -168,7 +168,7 @@ diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
 +    ]
 +    ]
 +
 +
  if CONFIG['OS_TARGET'] == 'WINNT':
  if CONFIG['OS_TARGET'] == 'WINNT':
-     DEFFILE = '!mozglue.def'
+     DEFFILE = 'mozglue.def'
      # We'll break the DLL blocklist if we immediately load user32.dll
      # We'll break the DLL blocklist if we immediately load user32.dll
      DELAYLOAD_DLLS += [
      DELAYLOAD_DLLS += [
          'user32.dll',
          'user32.dll',

+ 3 - 2
mozilla-release/patches/1481721-64a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1536706349 0
 # Date 1536706349 0
 # Node ID 23860890d959f318130e619976cbeae4472937a3
 # Node ID 23860890d959f318130e619976cbeae4472937a3
-# Parent  da36ef75492bd9bbd6b85b1c1039f7f4b4379657
+# Parent  98b779beea7eece56e580f4a09e52ddb29e5c727
 Bug 1481721 - Switch Linux nightlies and PGO builds to clang r=froydnj
 Bug 1481721 - Switch Linux nightlies and PGO builds to clang r=froydnj
 
 
 And enable LTO on CI builds using clang + PGO.
 And enable LTO on CI builds using clang + PGO.
@@ -12,7 +12,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D4991
 diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
 diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
 --- a/build/mozconfig.no-compile
 --- a/build/mozconfig.no-compile
 +++ b/build/mozconfig.no-compile
 +++ b/build/mozconfig.no-compile
-@@ -16,15 +16,16 @@ unset RUSTC
+@@ -16,16 +16,17 @@ unset RUSTC
  unset CARGO
  unset CARGO
  unset RUSTDOC
  unset RUSTDOC
  unset RUSTFMT
  unset RUSTFMT
@@ -27,6 +27,7 @@ diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
  unset ENABLE_CLANG_PLUGIN
  unset ENABLE_CLANG_PLUGIN
  
  
  unset MOZ_STDCXX_COMPAT
  unset MOZ_STDCXX_COMPAT
+ unset MOZ_NO_PIE_COMPAT
  
  
  unset NASM
  unset NASM
 diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix
 diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix

+ 5 - 5
mozilla-release/patches/1488307-64a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1535594149 -32400
 # Date 1535594149 -32400
 # Node ID e2a02b08089b0bd0c18ceac0b2eb1e3888d56dc2
 # Node ID e2a02b08089b0bd0c18ceac0b2eb1e3888d56dc2
-# Parent  0b88ec99d88949a2832dc4d9b843641397fd60f0
+# Parent  9577e937d37e096b48f3f92b6a065c6ba5b7bf27
 Bug 1488307 - Build the LLVM gold plugin. r=mshal
 Bug 1488307 - Build the LLVM gold plugin. r=mshal
 
 
 As much as it's tempting to use LLD for LTO, it still causes some
 As much as it's tempting to use LLD for LTO, it still causes some
@@ -16,7 +16,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D4896
 diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
 diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
 --- a/build/build-clang/build-clang.py
 --- a/build/build-clang/build-clang.py
 +++ b/build/build-clang/build-clang.py
 +++ b/build/build-clang/build-clang.py
-@@ -213,16 +213,18 @@ def build_one_stage(cc, cxx, asm, ld, ar
+@@ -212,16 +212,18 @@ def build_one_stage(cc, cxx, asm, ld, ar
              "-DCMAKE_BUILD_TYPE=%s" % build_type,
              "-DCMAKE_BUILD_TYPE=%s" % build_type,
              "-DCMAKE_INSTALL_PREFIX=%s" % inst_dir,
              "-DCMAKE_INSTALL_PREFIX=%s" % inst_dir,
              "-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64",
              "-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64",
@@ -30,8 +30,8 @@ diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
          if is_windows():
          if is_windows():
              cmake_args.insert(-1, "-DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
              cmake_args.insert(-1, "-DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
              cmake_args.insert(-1, "-DLLVM_USE_CRT_RELEASE=MT")
              cmake_args.insert(-1, "-DLLVM_USE_CRT_RELEASE=MT")
-         else:
-             # libllvm as a shared library is not supported on Windows
-             cmake_args += ["-DLLVM_LINK_LLVM_DYLIB=ON"]
          if ranlib is not None:
          if ranlib is not None:
              cmake_args += ["-DCMAKE_RANLIB=%s" % slashify_path(ranlib)]
              cmake_args += ["-DCMAKE_RANLIB=%s" % slashify_path(ranlib)]
+         if libtool is not None:
+             cmake_args += ["-DCMAKE_LIBTOOL=%s" % slashify_path(libtool)]
+         if osx_cross_compile:

+ 2 - 3
mozilla-release/patches/1489698-5-65a1.patch

@@ -3,14 +3,14 @@
 # Date 1536361555 14400
 # Date 1536361555 14400
 #      Fri Sep 07 19:05:55 2018 -0400
 #      Fri Sep 07 19:05:55 2018 -0400
 # Node ID a17dfbac6b10ec140dc69ed3053662987eba25ef
 # Node ID a17dfbac6b10ec140dc69ed3053662987eba25ef
-# Parent  15fa97a591c4509f30ddd99a3d0fe58da49ba67a
+# Parent  d5803dbb51b2399a89c048849c799661382b0005
 Bug 1489698 - Add moz.build for js/src/jit. r=jandem,froydnj
 Bug 1489698 - Add moz.build for js/src/jit. r=jandem,froydnj
 
 
 diff --git a/js/src/jit/moz.build b/js/src/jit/moz.build
 diff --git a/js/src/jit/moz.build b/js/src/jit/moz.build
 new file mode 100644
 new file mode 100644
 --- /dev/null
 --- /dev/null
 +++ b/js/src/jit/moz.build
 +++ b/js/src/jit/moz.build
-@@ -0,0 +1,247 @@
+@@ -0,0 +1,246 @@
 +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 +# vim: set filetype=python:
 +# vim: set filetype=python:
 +# This Source Code Form is subject to the terms of the Mozilla Public
 +# This Source Code Form is subject to the terms of the Mozilla Public
@@ -48,7 +48,6 @@ new file mode 100644
 +    'BaselineJIT.cpp',
 +    'BaselineJIT.cpp',
 +    'BitSet.cpp',
 +    'BitSet.cpp',
 +    'BytecodeAnalysis.cpp',
 +    'BytecodeAnalysis.cpp',
-+    'C1Spewer.cpp',
 +    'CacheIR.cpp',
 +    'CacheIR.cpp',
 +    'CacheIRCompiler.cpp',
 +    'CacheIRCompiler.cpp',
 +    'CacheIRSpewer.cpp',
 +    'CacheIRSpewer.cpp',

+ 4 - 4
mozilla-release/patches/1490463-2-64a1.patch

@@ -2,7 +2,7 @@
 # User Ted Mielczarek <ted@mielczarek.org>
 # User Ted Mielczarek <ted@mielczarek.org>
 # Date 1537300942 14400
 # Date 1537300942 14400
 # Node ID 23cb01b0c33ee3bd87ada94f26ac759584334bcb
 # Node ID 23cb01b0c33ee3bd87ada94f26ac759584334bcb
-# Parent  5052de28f8e3dcc0a2cb10c742dfaffe9b8a65f2
+# Parent  7253b1ea890e599a0160723a9de9494ce950c27f
 Bug 1490463 - part 2 - use srcdir_rel for passing manifest paths to mt.exe; r=mshal
 Bug 1490463 - part 2 - use srcdir_rel for passing manifest paths to mt.exe; r=mshal
 
 
 mt.exe doesn't like absolute paths, so we use srcdir-relative paths
 mt.exe doesn't like absolute paths, so we use srcdir-relative paths
@@ -12,11 +12,11 @@ diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
 +++ b/config/rules.mk
 @@ -547,25 +547,25 @@ endif
 @@ -547,25 +547,25 @@ endif
- $(PROGRAM): $(PROGOBJS) $(STATIC_LIBS) $(RUST_STATIC_LIB) $(EXTRA_DEPS) $(RESFILE) $(GLOBAL_DEPS) $(call mkdir_deps,$(FINAL_TARGET))
+ $(PROGRAM): $(PROGOBJS) $(STATIC_LIBS) $(EXTRA_DEPS) $(RESFILE) $(GLOBAL_DEPS) $(call mkdir_deps,$(FINAL_TARGET))
  	$(REPORT_BUILD)
  	$(REPORT_BUILD)
  	@$(RM) $@.manifest
  	@$(RM) $@.manifest
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
- 	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(STATIC_LIBS) $(RUST_STATIC_LIB) $(SHARED_LIBS) $(OS_LIBS)
+ 	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
  ifdef MSMANIFEST_TOOL
  ifdef MSMANIFEST_TOOL
  	@if test -f $@.manifest; then \
  	@if test -f $@.manifest; then \
  		if test -f '$(srcdir)/$(notdir $@).manifest'; then \
  		if test -f '$(srcdir)/$(notdir $@).manifest'; then \
@@ -91,7 +91,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  
  
  ifdef ENABLE_STRIP
  ifdef ENABLE_STRIP
 @@ -699,25 +699,25 @@ endif
 @@ -699,25 +699,25 @@ endif
- 	$(MKSHLIB) $($@_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
+ 	$(MKSHLIB) $($@_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
  	$(call py_action,check_binary,--target $@)
  	$(call py_action,check_binary,--target $@)
  
  
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))

+ 6 - 6
mozilla-release/patches/1492037-64a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1536532895 -32400
 # Date 1536532895 -32400
 # Node ID 7e05c2752c5a2a16082854a01e76e53c1b03659b
 # Node ID 7e05c2752c5a2a16082854a01e76e53c1b03659b
-# Parent  d935abfd00a6255711bd3657261121ad60b7adc8
+# Parent  dfccdced0ba85e2bc5d26f75df79b0fe31d4d359
 Bug 1492037 - Build clang with LLVM as a shared library. r=froydnj
 Bug 1492037 - Build clang with LLVM as a shared library. r=froydnj
 
 
 Doing so changes the size of the compressed toolchain archive from ~280M
 Doing so changes the size of the compressed toolchain archive from ~280M
@@ -55,12 +55,12 @@ diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
  import which
  import which
  from distutils.dir_util import copy_tree
  from distutils.dir_util import copy_tree
  
  
-@@ -215,16 +216,19 @@ def build_one_stage(cc, cxx, asm, ld, ar
-             "-DLLVM_ENABLE_ASSERTIONS=%s" % ("ON" if assertions else "OFF"),
-             "-DPYTHON_EXECUTABLE=%s" % slashify_path(python_path),
+@@ -217,16 +218,19 @@ def build_one_stage(cc, cxx, asm, ld, ar
              "-DLLVM_TOOL_LIBCXX_BUILD=%s" % ("ON" if build_libcxx else "OFF"),
              "-DLLVM_TOOL_LIBCXX_BUILD=%s" % ("ON" if build_libcxx else "OFF"),
              "-DLIBCXX_LIBCPPABI_VERSION=\"\"",
              "-DLIBCXX_LIBCPPABI_VERSION=\"\"",
          ]
          ]
+         if is_linux():
+             cmake_args += ["-DLLVM_BINUTILS_INCDIR=%s/include" % gcc_dir]
          if is_windows():
          if is_windows():
              cmake_args.insert(-1, "-DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
              cmake_args.insert(-1, "-DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
              cmake_args.insert(-1, "-DLLVM_USE_CRT_RELEASE=MT")
              cmake_args.insert(-1, "-DLLVM_USE_CRT_RELEASE=MT")
@@ -75,7 +75,7 @@ diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
              cmake_args += [
              cmake_args += [
                  "-DCMAKE_SYSTEM_NAME=Darwin",
                  "-DCMAKE_SYSTEM_NAME=Darwin",
                  "-DCMAKE_SYSTEM_VERSION=10.10",
                  "-DCMAKE_SYSTEM_VERSION=10.10",
-@@ -359,21 +363,27 @@ def prune_final_dir_for_clang_tidy(final
+@@ -361,21 +365,27 @@ def prune_final_dir_for_clang_tidy(final
      re_clang_tidy = re.compile(
      re_clang_tidy = re.compile(
          r"^clang-(apply-replacements|format|tidy)(\.exe)?$", re.I)
          r"^clang-(apply-replacements|format|tidy)(\.exe)?$", re.I)
      for f in glob.glob("%s/bin/*" % final_dir):
      for f in glob.glob("%s/bin/*" % final_dir):
@@ -106,7 +106,7 @@ diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
              delete(f)
              delete(f)
  
  
      # Completely remove libexec/, msbuilld-bin and tools, if it exists.
      # Completely remove libexec/, msbuilld-bin and tools, if it exists.
-@@ -593,21 +603,21 @@ if __name__ == "__main__":
+@@ -595,21 +605,21 @@ if __name__ == "__main__":
      if is_darwin():
      if is_darwin():
          extra_cflags = []
          extra_cflags = []
          extra_cxxflags = ["-stdlib=libc++"]
          extra_cxxflags = ["-stdlib=libc++"]

+ 8 - 8
mozilla-release/patches/1492268-64a1.patch

@@ -2,7 +2,7 @@
 # User Adam Gashlin <agashlin@mozilla.com>
 # User Adam Gashlin <agashlin@mozilla.com>
 # Date 1537309421 0
 # Date 1537309421 0
 # Node ID 61ffb6c642cde13f8a37ffbbe546d06ecd431c08
 # Node ID 61ffb6c642cde13f8a37ffbbe546d06ecd431c08
-# Parent  83a3de9a196a06faeeb39c508f8b5a94310dafb4
+# Parent  8d99732fab53c64ce08ccd4841ac77bc0536fe42
 Bug 1492268: Allow a Rust library to link to a program r=froydnj
 Bug 1492268: Allow a Rust library to link to a program r=froydnj
 
 
 Differential Revision: https://phabricator.services.mozilla.com/D6200
 Differential Revision: https://phabricator.services.mozilla.com/D6200
@@ -10,7 +10,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D6200
 diff --git a/config/rules.mk b/config/rules.mk
 diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
 +++ b/config/rules.mk
-@@ -532,21 +532,21 @@ LINKER_OUT=$(subst /,\,$1)
+@@ -539,21 +539,21 @@ LINKER_OUT=$(subst /,\,$1)
  else
  else
  LINKER_OUT=$1
  LINKER_OUT=$1
  endif
  endif
@@ -29,12 +29,12 @@ diff --git a/config/rules.mk b/config/rules.mk
  ifdef MSMANIFEST_TOOL
  ifdef MSMANIFEST_TOOL
  	@if test -f $@.manifest; then \
  	@if test -f $@.manifest; then \
  		if test -f '$(srcdir)/$(notdir $@).manifest'; then \
  		if test -f '$(srcdir)/$(notdir $@).manifest'; then \
- 			echo 'Embedding manifest from $(srcdir)/$(notdir $@).manifest and $@.manifest'; \
- 			$(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
+ 			echo 'Embedding manifest from $(srcdir_rel)/$(notdir $@).manifest and $@.manifest'; \
+ 			$(MT) -NOLOGO -MANIFEST '$(srcdir_rel)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
  		else \
  		else \
  			echo 'Embedding manifest from $@.manifest'; \
  			echo 'Embedding manifest from $@.manifest'; \
  			$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
  			$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
-@@ -557,17 +557,17 @@ ifdef MSMANIFEST_TOOL
+@@ -564,17 +564,17 @@ ifdef MSMANIFEST_TOOL
  	fi
  	fi
  endif	# MSVC with manifest tool
  endif	# MSVC with manifest tool
  ifdef MOZ_PROFILE_GENERATE
  ifdef MOZ_PROFILE_GENERATE
@@ -53,7 +53,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  endif
  endif
  ifdef MOZ_POST_PROGRAM_COMMAND
  ifdef MOZ_POST_PROGRAM_COMMAND
  	$(MOZ_POST_PROGRAM_COMMAND) $@
  	$(MOZ_POST_PROGRAM_COMMAND) $@
-@@ -677,22 +677,22 @@ else
+@@ -686,22 +686,22 @@ else
  	$(HOST_CXX) $(HOST_OUTOPTION)$@ $(HOST_OBJS) $(HOST_CXX_LDFLAGS) $(HOST_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
  	$(HOST_CXX) $(HOST_OUTOPTION)$@ $(HOST_OBJS) $(HOST_CXX_LDFLAGS) $(HOST_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
  endif
  endif
  
  
@@ -77,11 +77,11 @@ diff --git a/config/rules.mk b/config/rules.mk
  ifdef EMBED_MANIFEST_AT
  ifdef EMBED_MANIFEST_AT
  	@if test -f $@.manifest; then \
  	@if test -f $@.manifest; then \
  		if test -f '$(srcdir)/$@.manifest'; then \
  		if test -f '$(srcdir)/$@.manifest'; then \
- 			echo 'Embedding manifest from $(srcdir)/$@.manifest and $@.manifest'; \
+ 			echo 'Embedding manifest from $(srcdir_rel)/$@.manifest and $@.manifest'; \
 diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
 diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
 --- a/python/mozbuild/mozbuild/backend/recursivemake.py
 --- a/python/mozbuild/mozbuild/backend/recursivemake.py
 +++ b/python/mozbuild/mozbuild/backend/recursivemake.py
 +++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1394,37 +1394,37 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1473,37 +1473,37 @@ class RecursiveMakeBackend(CommonBackend
              if isinstance(lib, (HostLibrary, HostRustLibrary)):
              if isinstance(lib, (HostLibrary, HostRustLibrary)):
                  backend_file.write_once('HOST_LIBS += %s\n' %
                  backend_file.write_once('HOST_LIBS += %s\n' %
                                          pretty_relpath(lib, lib.import_name))
                                          pretty_relpath(lib, lib.import_name))

+ 0 - 0
mozilla-release/patches/1494752-604.patch → mozilla-release/patches/1494752-6031.patch


+ 11 - 11
mozilla-release/patches/1499430-605.patch → mozilla-release/patches/1499430-66a1.patch

@@ -1,9 +1,9 @@
 # HG changeset patch
 # HG changeset patch
 # User Masayuki Nakano <masayuki@d-toybox.com>
 # User Masayuki Nakano <masayuki@d-toybox.com>
-# Date 1547115133 -32400
-# Node ID 2218e4b1e2cdd28586e1bcc0ca191034a119d5e9
-# Parent  5f723748d4e736782b600bf3dc46ef4de0537b00
-Bug 1499430 - Make PresShell::PageMove() use result of nsFrameSelection::GetFrameToPageSelect() when PresShell::GetScrollableFrameToScroll() returns nullptr. r=smaug a=jorgk
+# Date 1547096576 0
+# Node ID 87e21b003b079e91d7e833853116a343fcae8cee
+# Parent  a7ead2656f08f64af00b8f0c562aac3d866c0a24
+Bug 1499430 - Make PresShell::PageMove() use result of nsFrameSelection::GetFrameToPageSelect() when PresShell::GetScrollableFrameToScroll() returns nullptr r=smaug
 
 
 If there is no scrollable frame, PresShell::GetScrollableFrameToScroll() returns
 If there is no scrollable frame, PresShell::GetScrollableFrameToScroll() returns
 nullptr.  However, even when we don't expand selection, we need to move caret
 nullptr.  However, even when we don't expand selection, we need to move caret
@@ -11,10 +11,12 @@ in current selection root.  Therefore, it should call
 nsFrameSelection::CommonPageMove() with the result of
 nsFrameSelection::CommonPageMove() with the result of
 nsFrameSelection::GetFrameToPageSelect() to move caret.
 nsFrameSelection::GetFrameToPageSelect() to move caret.
 
 
+Differential Revision: https://phabricator.services.mozilla.com/D16020
+
 diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
 diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
 --- a/layout/base/PresShell.cpp
 --- a/layout/base/PresShell.cpp
 +++ b/layout/base/PresShell.cpp
 +++ b/layout/base/PresShell.cpp
-@@ -2249,26 +2249,28 @@ PresShell::IntraLineMove(bool aForward, 
+@@ -2228,26 +2228,27 @@ PresShell::IntraLineMove(bool aForward, 
  {
  {
    RefPtr<nsFrameSelection> frameSelection = mSelection;
    RefPtr<nsFrameSelection> frameSelection = mSelection;
    return frameSelection->IntraLineMove(aForward, aExtend);
    return frameSelection->IntraLineMove(aForward, aExtend);
@@ -31,14 +33,12 @@ diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
    if (!aExtend) {
    if (!aExtend) {
      frame = do_QueryFrame(GetScrollableFrameToScroll(nsIPresShell::eVertical));
      frame = do_QueryFrame(GetScrollableFrameToScroll(nsIPresShell::eVertical));
 -  } else {
 -  } else {
+-    frame = mSelection->GetFrameToPageSelect();
 +    // If there is no scrollable frame, get the frame to move caret instead.
 +    // If there is no scrollable frame, get the frame to move caret instead.
-+  }
-+
-+  if (!frame) {
-     frame = mSelection->GetFrameToPageSelect();
--  }
--  if (!frame) {
+   }
+   if (!frame) {
 -    return NS_OK;
 -    return NS_OK;
++    frame = mSelection->GetFrameToPageSelect();
 +    if (!frame) {
 +    if (!frame) {
 +      return NS_OK;
 +      return NS_OK;
 +    }
 +    }

+ 1 - 22
mozilla-release/patches/1502159-2-65a1.patch

@@ -2,7 +2,7 @@
 # User Matthew Gaudet <mgaudet@mozilla.com>
 # User Matthew Gaudet <mgaudet@mozilla.com>
 # Date 1540568623 0
 # Date 1540568623 0
 # Node ID 1c2afde752e7eb78e6d4b4ebe10b1f1e3c3842f7
 # Node ID 1c2afde752e7eb78e6d4b4ebe10b1f1e3c3842f7
-# Parent  9124468a25f5f3b1bcc7a4195425ccb9d96ef12b
+# Parent  805a8e1feffb94b1fade5614b62b31283dfcc7df
 Bug 1502159 - Remove C1Spewer r=jandem
 Bug 1502159 - Remove C1Spewer r=jandem
 
 
 It appears the C1 Spewer is not partciularly well used. Loading logs into
 It appears the C1 Spewer is not partciularly well used. Loading logs into
@@ -462,24 +462,3 @@ diff --git a/js/src/jit/JitSpewer.h b/js/src/jit/JitSpewer.h
      bool isSpewing() const {
      bool isSpewing() const {
          return graph_;
          return graph_;
      }
      }
-diff --git a/js/src/jit/moz.build b/js/src/jit/moz.build
---- a/js/src/jit/moz.build
-+++ b/js/src/jit/moz.build
-@@ -30,17 +30,16 @@ UNIFIED_SOURCES += [
-     'BaselineDebugModeOSR.cpp',
-     'BaselineFrame.cpp',
-     'BaselineFrameInfo.cpp',
-     'BaselineIC.cpp',
-     'BaselineInspector.cpp',
-     'BaselineJIT.cpp',
-     'BitSet.cpp',
-     'BytecodeAnalysis.cpp',
--    'C1Spewer.cpp',
-     'CacheIR.cpp',
-     'CacheIRCompiler.cpp',
-     'CacheIRSpewer.cpp',
-     'CodeGenerator.cpp',
-     'CompileWrappers.cpp',
-     'Disassembler.cpp',
-     'EagerSimdUnbox.cpp',
-     'EdgeCaseAnalysis.cpp',

+ 0 - 0
mozilla-release/patches/1513900-PARTIAL-stdcppcompat-60.patch → mozilla-release/patches/1513900-PARTIAL-stdcppcompat-6041.patch


+ 0 - 0
mozilla-release/patches/1514202-2only-SIMPLIFIED-67a1.patch → mozilla-release/patches/1514202-2only-SIMPLIFIED-66a1.patch


+ 4 - 4
mozilla-release/patches/1515579-2only-66a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1547163466 0
 # Date 1547163466 0
 # Node ID fa8e39feef4389d1ff83fe952c76ffba7c2217d6
 # Node ID fa8e39feef4389d1ff83fe952c76ffba7c2217d6
-# Parent  d77804d83c27036db5e9e99aedc8ff54e9482a82
+# Parent  8c386fe82f74e7cc20d61f839d7438a65e58dfba
 Bug 1515579 - Use absolute paths for compilers, etc. r=ted
 Bug 1515579 - Use absolute paths for compilers, etc. r=ted
 
 
 In bug 1259382, some workarounds were added to make the build system
 In bug 1259382, some workarounds were added to make the build system
@@ -188,7 +188,7 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
 diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure
 diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure
 --- a/build/moz.configure/windows.configure
 --- a/build/moz.configure/windows.configure
 +++ b/build/moz.configure/windows.configure
 +++ b/build/moz.configure/windows.configure
-@@ -242,37 +242,33 @@ def valid_ucrt_sdk_dir(windows_sdk_dir, 
+@@ -251,37 +251,33 @@ def valid_ucrt_sdk_dir(windows_sdk_dir, 
      return namespace(
      return namespace(
          path=sdk.path,
          path=sdk.path,
          include=sdk.include,
          include=sdk.include,
@@ -230,7 +230,7 @@ diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows
          result = next
          result = next
          if p.lower() == 'bin':
          if p.lower() == 'bin':
              break
              break
-@@ -463,30 +459,16 @@ link = check_prog('LINKER', linker_progs
+@@ -472,30 +468,16 @@ link = check_prog('LINKER', linker_progs
                    paths=toolchain_search_path)
                    paths=toolchain_search_path)
  
  
  host_link = check_prog('HOST_LINKER', linker_progs_for(host),
  host_link = check_prog('HOST_LINKER', linker_progs_for(host),
@@ -296,6 +296,7 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 -                     (lambda t: t.kernel == 'WINNT'))
 -                     (lambda t: t.kernel == 'WINNT'))
 +                     (lambda t: t.kernel == 'WINNT'),
 +                     (lambda t: t.kernel == 'WINNT'),
 +                     paths=sdk_bin_path)
 +                     paths=sdk_bin_path)
+     add_old_configure_assignment('FXC', fxc)
      wine = check_prog('WINE', ['wine'], when=depends(target, host)
      wine = check_prog('WINE', ['wine'], when=depends(target, host)
                        (lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux'))
                        (lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux'))
  
  
@@ -303,4 +304,3 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
  # VPX
  # VPX
  # ===
  # ===
  
  
- with only_when(compile_environment):

+ 8 - 7
mozilla-release/patches/1519325-66a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1547245284 0
 # Date 1547245284 0
 # Node ID e69490bbd056d1fd3516cc44f1b2d88700b6d647
 # Node ID e69490bbd056d1fd3516cc44f1b2d88700b6d647
-# Parent  70b16a4831b222d1e9f78bd706aad59e2fee78e1
+# Parent  d11a57d66098c5a45b83d34a1c55f9128936d597
 Bug 1519325 - Move D3D compiler DLL detection to python configure. r=froydnj
 Bug 1519325 - Move D3D compiler DLL detection to python configure. r=froydnj
 
 
 MOZ_D3D_CPU_SUFFIX and MOZ_HAS_WINSDK_WITH_D3D are not used in the
 MOZ_D3D_CPU_SUFFIX and MOZ_HAS_WINSDK_WITH_D3D are not used in the
@@ -46,7 +46,7 @@ diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows
 diff --git a/old-configure.in b/old-configure.in
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
 +++ b/old-configure.in
-@@ -2106,132 +2106,20 @@ dnl = Universalchardet
+@@ -2113,132 +2113,20 @@ dnl = Universalchardet
  dnl ========================================================
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(universalchardet,
  MOZ_ARG_DISABLE_BOOL(universalchardet,
  [  --disable-universalchardet
  [  --disable-universalchardet
@@ -180,7 +180,7 @@ diff --git a/old-configure.in b/old-configure.in
        AC_MSG_ERROR([Can't find header linux/joystick.h, needed for gamepad support. Please install Linux kernel headers.])
        AC_MSG_ERROR([Can't find header linux/joystick.h, needed for gamepad support. Please install Linux kernel headers.])
      fi
      fi
  fi
  fi
-@@ -3237,22 +3125,16 @@ AC_SUBST(MOZ_UNIVERSALCHARDET)
+@@ -3176,22 +3064,16 @@ AC_SUBST(MOZ_UNIVERSALCHARDET)
  AC_SUBST(MOZ_SPELLCHECK)
  AC_SUBST(MOZ_SPELLCHECK)
  AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
  AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
  AC_SUBST(MOZ_CRASHREPORTER)
  AC_SUBST(MOZ_CRASHREPORTER)
@@ -206,15 +206,15 @@ diff --git a/old-configure.in b/old-configure.in
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -1237,17 +1237,16 @@ set_define('MOZ_REFLOW_PERF_DSP', reflow
- 
+@@ -1179,17 +1179,16 @@ set_config('MOZ_UNSIGNED_SYSTEM_SCOPE', 
  
  
  # Shader Compiler for Windows (and MinGW Cross Compile)
  # Shader Compiler for Windows (and MinGW Cross Compile)
  # ==============================================================
  # ==============================================================
  
  
  with only_when(compile_environment):
  with only_when(compile_environment):
      fxc = check_prog('FXC', ('fxc.exe', 'fxc2.exe'), when=depends(target)
      fxc = check_prog('FXC', ('fxc.exe', 'fxc2.exe'), when=depends(target)
-                      (lambda t: t.kernel == 'WINNT'))
+                      (lambda t: t.kernel == 'WINNT'),
+                      paths=sdk_bin_path)
 -    add_old_configure_assignment('FXC', fxc)
 -    add_old_configure_assignment('FXC', fxc)
      wine = check_prog('WINE', ['wine'], when=depends(target, host)
      wine = check_prog('WINE', ['wine'], when=depends(target, host)
                        (lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux'))
                        (lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux'))
@@ -224,7 +224,7 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
  # ===
  # ===
  
  
  with only_when(compile_environment):
  with only_when(compile_environment):
-@@ -1444,15 +1443,56 @@ def valid_yasm_version(yasm_version, for
+@@ -1419,16 +1418,57 @@ def valid_yasm_version(yasm_version, for
      by_version = sorted(versioned.items(), key=lambda x: x[1])
      by_version = sorted(versioned.items(), key=lambda x: x[1])
      if by_version:
      if by_version:
          what, version = by_version[-1]
          what, version = by_version[-1]
@@ -281,3 +281,4 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
  
  
  set_config("MOZ_CRASHREPORTER_URL",
  set_config("MOZ_CRASHREPORTER_URL",
             depends("--with-crashreporter-url")(lambda x: x[0].rstrip("/")))
             depends("--with-crashreporter-url")(lambda x: x[0].rstrip("/")))
+ 

File diff suppressed because it is too large
+ 215 - 219
mozilla-release/patches/series


Some files were not shown because too many files changed in this diff