fix fuzz and bad rebase which had no consequences

frg/work-js/mozilla-release/patches/1464869-09-62a1.patch

@@ -2,7 +2,7 @@
 # User Sylvestre Ledru <sledru@mozilla.com>
 # Date 1528283054 -7200
 # Node ID fd9de8dd00a40f86c3e82ce2c1ec4b182c38be08
-# Parent  2f93ed599685ff28db68e72426e3fda9b98e1631
+# Parent  25975eb8f00fecc65f8272be47dd6983b2447185
 Bug 1464869 - Fix flake8/pep8 issue by hand in js/ r=jorendorff
 
 MozReview-Commit-ID: 7cbfMkdykXn
@@ -2418,8 +2418,7 @@ diff --git a/js/src/util/make_unicode.py b/js/src/util/make_unicode.py
      assert folding_shift == 6
  
      # verify correctness
-@@ -1451,18 +1454,18 @@ def make_irregexp_tables(version,
-         digit_chars = [ord(ch) for ch in string.digits]
+@@ -1452,17 +1455,18 @@ def make_irregexp_tables(version,
          assert all(ch <= MAX_ASCII for ch in digit_chars)
  
          # Characters in \w, 21.2.2.12 CharacterClassEscape.
@@ -2427,7 +2426,7 @@ diff --git a/js/src/util/make_unicode.py b/js/src/util/make_unicode.py
          assert all(ch <= MAX_ASCII for ch in word_chars)
  
          # Characters which case-fold to characters in \w.
--        ignorecase_word_chars = (word_chars +
+         ignorecase_word_chars = (word_chars +
 -                                 [ch for ch in range(MAX_ASCII + 1, MAX_BMP + 1) if casefolds_to_ascii(ch)])
 +                                 [ch for ch in range(MAX_ASCII + 1, MAX_BMP + 1)
 +                                  if casefolds_to_ascii(ch)])
@@ -2439,7 +2438,7 @@ diff --git a/js/src/util/make_unicode.py b/js/src/util/make_unicode.py
          write(unicode_version_message.format(version))
          println('#include "irregexp/RegExpCharacters.h"')
          println('')
-@@ -1509,31 +1512,38 @@ def update_unicode(args):
+@@ -1509,31 +1513,38 @@ def update_unicode(args):
          print('\tVersion: %s' % version)
          print('\tDownload url: %s' % url)
  

frg/work-js/mozilla-release/patches/1478903-63a1.patch

@@ -2,14 +2,14 @@
 # User David Major <dmajor@mozilla.com>
 # Date 1532695879 14400
 # Node ID 17d02fcdf8d5b316da603371916c9e80b867c601
-# Parent  c2393fe764fcdd94a8ab839828c9c58a9f644937
+# Parent  a3e5f1cd857f11d8c6d23f155f20e59cf477bf12
 Bug 1478903 - Don't disable PGO for the js shell in clang-cl. r=froydnj
 
 diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build
 --- a/js/src/shell/moz.build
 +++ b/js/src/shell/moz.build
-@@ -21,20 +21,20 @@ DEFINES['EXPORT_JS_API'] = True
- DEFINES['ENABLE_WASM_GLOBAL'] = True
+@@ -20,20 +20,20 @@ UNIFIED_SOURCES += [
+ DEFINES['EXPORT_JS_API'] = True
  
  if CONFIG['NIGHTLY_BUILD']:
      DEFINES['ENABLE_WASM_GC'] = True

frg/work-js/mozilla-release/patches/1515581-66a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1545344724 0
 # Node ID dca16fc55e60d74323807411fb441b4a6c60c97c
-# Parent  f63a0d0975fd60658a402fa2ebaa47ae755eaee7
+# Parent  c13d65ce127db2f7c18ea1e4ca866bd14b53e8bd
 Bug 1515581 - Move RC and WINDRES to python configure. r=nalexander
 
 Remove the version check for WINDRES, because, as per bug 454112, it
@@ -35,7 +35,7 @@ diff --git a/build/autoconf/toolchain.m4 b/build/autoconf/toolchain.m4
 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
-@@ -2096,8 +2096,19 @@ def make_shared_library(target, compiler
+@@ -2095,8 +2095,19 @@ def make_shared_library(target, compiler
      return namespace(
          mkshlib=cxx + flags + soname + output,
          mkcshlib=cc + flags + soname + output,
@@ -130,7 +130,7 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
      AC_DEFINE_UNQUOTED(_WIN32_IE,0x0800)
  
      ;;
-@@ -575,25 +554,23 @@ case "$target" in
+@@ -574,25 +553,23 @@ case "$target" in
      	CXXFLAGS="$CXXFLAGS -mieee"
      ;;
      esac
@@ -156,7 +156,7 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
  
          if test -z "$CLANG_CC"; then
              # Use static libgcc and libstdc++
-@@ -1611,17 +1588,16 @@ dnl = Maintainer debug option (no --enab
+@@ -1602,17 +1579,16 @@ dnl = Maintainer debug option (no --enab
  dnl =
  dnl ========================================================
  
@@ -276,9 +276,9 @@ diff --git a/old-configure.in b/old-configure.in
          LIBS="$LIBS -luuid -lusp10 -lgdi32 -lwinmm -lwsock32 -luserenv -lsecur32"
          MOZ_FIX_LINK_PATHS=
  
-         WIN32_CONSOLE_EXE_LDFLAGS=-mconsole
-         WIN32_GUI_EXE_LDFLAGS=-mwindows
-@@ -3614,19 +3590,17 @@ dnl = Maintainer debug option (no --enab
+         MOZ_OPTIMIZE_FLAGS="-O1"
+ 
+@@ -3499,19 +3475,17 @@ dnl = Maintainer debug option (no --enab
  dnl =
  dnl ========================================================
  
@@ -298,7 +298,7 @@ diff --git a/old-configure.in b/old-configure.in
  AC_SUBST(WARNINGS_AS_ERRORS)
  AC_SUBST_LIST(WARNINGS_CFLAGS)
  AC_SUBST_SET(MOZ_EXTENSIONS)
-@@ -4108,17 +4082,16 @@ if test -z "$direct_nspr_config"; then
+@@ -3986,17 +3960,16 @@ if test -z "$direct_nspr_config"; then
      CFLAGS="$_SUBDIR_CFLAGS"
      CPPFLAGS="$_SUBDIR_CPPFLAGS"
      CXXFLAGS="$_SUBDIR_CXXFLAGS"
@@ -316,7 +316,7 @@ diff --git a/old-configure.in b/old-configure.in
  # Run all configure scripts specified by a subconfigure
  if test -n "$_subconfigure_subdir"; then
    _save_srcdir="$srcdir"
-@@ -4142,17 +4115,16 @@ CXX="$_SUBDIR_CXX"
+@@ -4020,17 +3993,16 @@ CXX="$_SUBDIR_CXX"
  CFLAGS="$_SUBDIR_CFLAGS"
  CPPFLAGS="$_SUBDIR_CPPFLAGS"
  CXXFLAGS="$_SUBDIR_CXXFLAGS"