Backed out 3 changesets (bug 1660340, bug 1641674, bug 1660896) for causing Btime failures on Android 7.0 . CLOSED TREE

Backed out changeset d445d03a6ca0 (bug 1660340) Backed out changeset 94c19736f73e (bug 1660896) Backed out changeset 0ba092f930cc (bug 1641674)
2024-10-07 09:54:42 +00:00 · 2020-08-28 23:31:52 +03:00 · 2020-08-28 23:31:52 +03:00 · f81ec36d9c
commit f81ec36d9c
parent 672892c504
9 changed files with 12 additions and 67 deletions
--- a/build/autoconf/compiler-opts.m4
+++ b/build/autoconf/compiler-opts.m4
@ -109,7 +109,7 @@ dnl ========================================================
 dnl = Automatically remove dead symbols
 dnl ========================================================

-if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$DEVELOPER_OPTIONS" -a -z "$MOZ_PROFILE_GENERATE"; then
+if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$DEVELOPER_OPTIONS"; then
    if test -n "$MOZ_DEBUG_FLAGS"; then
        dnl See bug 670659
        AC_CACHE_CHECK([whether removing dead symbols breaks debugging],
--- a/build/moz.configure/lto-pgo.configure
+++ b/build/moz.configure/lto-pgo.configure
@ -25,9 +25,6 @@ set_config('MOZ_PROFILE_GENERATE',
 set_define('MOZ_PROFILE_GENERATE',
           depends_if('--enable-profile-generate')(lambda _: True))

-add_old_configure_assignment('MOZ_PROFILE_GENERATE', 1,
-                             when='--enable-profile-generate')
-
 js_option('--enable-profile-use',
          env='MOZ_PROFILE_USE',
          nargs='?',
--- a/taskcluster/ci/toolchain/cctools-port.yml
+++ b/taskcluster/ci/toolchain/cctools-port.yml
@ -17,6 +17,7 @@ linux64-cctools-port-clang-9:
        symbol: TL(cctools)
    run:
        script: build-cctools-port.sh
+        toolchain-alias: linux64-cctools-port
        toolchain-artifact: public/build/cctools.tar.xz
        tooltool-downloads: internal
    fetches:
@ -41,7 +42,6 @@ linux64-cctools-port-clang-11:
        symbol: TL(cctools-clang-11)
    run:
        script: build-cctools-port.sh
-        toolchain-alias: linux64-cctools-port
        toolchain-artifact: public/build/cctools.tar.xz
        tooltool-downloads: internal
    fetches:
--- a/taskcluster/ci/toolchain/clang.yml
+++ b/taskcluster/ci/toolchain/clang.yml
@ -62,6 +62,7 @@ linux64-clang-9:
            - 'build/build-clang/clang-linux64.json'
        resources:
            - 'build/build-clang/clang-linux64.json'
+        toolchain-alias: linux64-clang
        toolchain-artifact: public/build/clang.tar.zst
    fetches:
        fetch:
@ -131,6 +132,7 @@ linux64-clang-9-android-cross:
            - 'build/build-clang/clang-android.json'
        resources:
            - 'build/build-clang/clang-android.json'
+        toolchain-alias: linux64-clang-android-cross
        toolchain-artifact: public/build/clang.tar.zst
    fetches:
        fetch:
@ -155,6 +157,7 @@ linux64-clang-9-aarch64-cross:
            - 'build/build-clang/clang-linux64-aarch64-cross.json'
        resources:
            - 'build/build-clang/clang-linux64-aarch64-cross.json'
+        toolchain-alias: linux64-clang-aarch64-cross
        toolchain-artifact: public/build/clang.tar.zst
    fetches:
        fetch:
@ -172,6 +175,7 @@ linux64-clang-9-macosx-cross:
        max-run-time: 600
    run:
        script: repack-clang-linux-macosx-cross.sh
+        toolchain-alias: linux64-clang-macosx-cross
        toolchain-artifact: public/build/clang.tar.zst
    dependencies:
        macosx64-clang-9: toolchain-macosx64-clang-9
@ -192,6 +196,7 @@ linux64-clang-9-win-cross:
        max-run-time: 600
    run:
        script: repack-clang-linux-win-cross.sh
+        toolchain-alias: linux64-clang-win-cross
        toolchain-artifact: public/build/clang.tar.zst
    dependencies:
        win64-clang-cl-9-2stage: toolchain-win64-clang-cl-9-2stage
@ -246,6 +251,7 @@ macosx64-clang-9:
        resources:
            - 'build/build-clang/clang-macosx64.json'
            - 'taskcluster/scripts/misc/tooltool-download.sh'
+        toolchain-alias: macosx64-clang
        toolchain-artifact: public/build/clang.tar.zst
    fetches:
        fetch:
@ -276,6 +282,7 @@ win64-clang-cl-9:
        resources:
            - 'build/build-clang/clang-win64.json'
            - 'taskcluster/scripts/misc/tooltool-download.sh'
+        toolchain-alias: win64-clang-cl
        toolchain-artifact: public/build/clang.tar.zst
        tooltool-downloads: internal
    fetches:
@ -299,6 +306,7 @@ win64-clang-cl-9-2stage:
        resources:
            - 'build/build-clang/clang-win64-2stage.json'
            - 'taskcluster/scripts/misc/tooltool-download.sh'
+        toolchain-alias: win64-clang-cl-2stage
        toolchain-artifact: public/build/clang.tar.zst
        tooltool-downloads: internal
    fetches:
@ -321,7 +329,6 @@ linux64-clang-11:
            - 'build/build-clang/clang-11-linux64.json'
        resources:
            - 'build/build-clang/clang-11-linux64.json'
-        toolchain-alias: linux64-clang
        toolchain-artifact: public/build/clang.tar.zst
    fetches:
        fetch:
@ -342,7 +349,6 @@ linux64-clang-11-android-cross:
            - 'build/build-clang/clang-11-android.json'
        resources:
            - 'build/build-clang/clang-11-android.json'
-        toolchain-alias: linux64-clang-android-cross
        toolchain-artifact: public/build/clang.tar.zst
    fetches:
        fetch:
@ -367,7 +373,6 @@ linux64-clang-11-aarch64-cross:
            - 'build/build-clang/clang-11-linux64-aarch64-cross.json'
        resources:
            - 'build/build-clang/clang-11-linux64-aarch64-cross.json'
-        toolchain-alias: linux64-clang-aarch64-cross
        toolchain-artifact: public/build/clang.tar.zst
    fetches:
        fetch:
@ -385,7 +390,6 @@ linux64-clang-11-macosx-cross:
        max-run-time: 600
    run:
        script: repack-clang-linux-macosx-cross.sh
-        toolchain-alias: linux64-clang-macosx-cross
        toolchain-artifact: public/build/clang.tar.zst
    dependencies:
        macosx64-clang-11: toolchain-macosx64-clang-11
@ -406,7 +410,6 @@ linux64-clang-11-win-cross:
        max-run-time: 600
    run:
        script: repack-clang-linux-win-cross.sh
-        toolchain-alias: linux64-clang-win-cross
        toolchain-artifact: public/build/clang.tar.zst
    dependencies:
        win64-clang-cl-11-2stage: toolchain-win64-clang-cl-11-2stage
@ -440,7 +443,6 @@ macosx64-clang-11:
        resources:
            - 'build/build-clang/clang-11-macosx64.json'
            - 'taskcluster/scripts/misc/tooltool-download.sh'
-        toolchain-alias: macosx64-clang
        toolchain-artifact: public/build/clang.tar.zst
    fetches:
        fetch:
@ -477,7 +479,6 @@ win64-clang-cl-11:
        resources:
            - 'build/build-clang/clang-11-win64.json'
            - 'taskcluster/scripts/misc/tooltool-download.sh'
-        toolchain-alias: win64-clang-cl
        toolchain-artifact: public/build/clang.tar.zst
        tooltool-downloads: internal
    fetches:
@ -501,7 +502,6 @@ win64-clang-cl-11-2stage:
        resources:
            - 'build/build-clang/clang-11-win64-2stage.json'
            - 'taskcluster/scripts/misc/tooltool-download.sh'
-        toolchain-alias: win64-clang-cl-2stage
        toolchain-artifact: public/build/clang.tar.zst
        tooltool-downloads: internal
    fetches:
--- a/taskcluster/ci/toolchain/misc.yml
+++ b/taskcluster/ci/toolchain/misc.yml
@ -151,6 +151,7 @@ wasi-sysroot-9:
        script: build-wasi-sysroot.sh
        sparse-profile: null
        toolchain-artifact: public/build/wasi-sysroot.tar.xz
+        toolchain-alias: wasi-sysroot
    fetches:
        fetch:
            - clang-9
@ -169,7 +170,6 @@ wasi-sysroot-11:
    run:
        script: build-wasi-sysroot.sh
        sparse-profile: null
-        toolchain-alias: wasi-sysroot
        toolchain-artifact: public/build/wasi-sysroot.tar.xz
    fetches:
        fetch:
--- a/testing/web-platform/meta/editing/run/bold.html.ini
+++ b/testing/web-platform/meta/editing/run/bold.html.ini
@ -95,16 +95,6 @@
  [[["bold",""\]\] "foo{<i><b></b></i>}baz" queryCommandState("bold") after]
    expected: FAIL

-  [[["stylewithcss","false"\],["bold",""\]\] "<span>[foo</span> <span>bar\]</span>" compare innerHTML]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: FAIL
-
-  [[["stylewithcss","false"\],["bold",""\]\] "<p>[foo</p><p> <span>bar</span> </p><p>baz\]</p>" compare innerHTML]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: FAIL
-

 [bold.html?1001-2000]
  [[["stylewithcss","false"\],["bold",""\]\] "foo[<span style=\\"font-weight: bold\\">bar</span>\]baz" queryCommandState("stylewithcss") before]
--- a/testing/web-platform/meta/editing/run/fontname.html.ini
+++ b/testing/web-platform/meta/editing/run/fontname.html.ini
@ -83,16 +83,6 @@
  [[["stylewithcss","false"\],["fontname","sans-serif"\]\] "[foo<kbd>bar</kbd>baz\]" queryCommandIndeterm("fontname") after]
    expected: FAIL

-  [[["stylewithcss","false"\],["fontname","sans-serif"\]\] "<span>[foo</span> <span>bar\]</span>" compare innerHTML]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: FAIL
-
-  [[["stylewithcss","false"\],["fontname","sans-serif"\]\] "<p>[foo</p><p> <span>bar</span> </p><p>baz\]</p>" compare innerHTML]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: FAIL
-

 [fontname.html?1001-2000]
  [[["stylewithcss","false"\],["fontname","sans-serif"\]\] "[foo<pre>bar</pre>baz\]" queryCommandIndeterm("fontname") after]
--- a/testing/web-platform/meta/editing/run/hilitecolor.html.ini
+++ b/testing/web-platform/meta/editing/run/hilitecolor.html.ini
@ -309,10 +309,7 @@
    expected: FAIL

  [[["stylewithcss","true"\],["hilitecolor","#00FFFF"\]\] "<font size=6>[foo\]</font>" queryCommandValue("hilitecolor") after]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: PASS
-      FAIL
+    expected: FAIL

  [[["stylewithcss","false"\],["hilitecolor","#00FFFF"\]\] "<font size=6>[foo\]</font>" queryCommandValue("hilitecolor") after]
    expected: FAIL
@ -341,22 +338,3 @@
  [[["stylewithcss","false"\],["hilitecolor","#00FFFF"\]\] "[foo<span style=font-size:xx-large>bar</span>baz\]" queryCommandValue("hilitecolor") after]
    expected: FAIL

-  [[["stylewithcss","false"\],["hilitecolor","#00FFFF"\]\] "<font size=6>[foo\]</font>" compare innerHTML]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: FAIL
-
-  [[["stylewithcss","true"\],["hilitecolor","#00FFFF"\]\] "[foo<font size=6>bar</font>baz\]" compare innerHTML]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: FAIL
-
-  [[["stylewithcss","false"\],["hilitecolor","#00FFFF"\]\] "[foo<font size=6>bar</font>baz\]" compare innerHTML]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: FAIL
-
-  [[["stylewithcss","true"\],["hilitecolor","#00FFFF"\]\] "<font size=6>[foo\]</font>" compare innerHTML]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: FAIL
--- a/testing/web-platform/meta/editing/run/italic.html.ini
+++ b/testing/web-platform/meta/editing/run/italic.html.ini
@ -191,16 +191,6 @@
  [[["stylewithcss","false"\],["italic",""\]\] "foo<var>b[a\]r</var>baz" queryCommandState("italic") after]
    expected: FAIL

-  [[["stylewithcss","false"\],["italic",""\]\] "<p>[foo</p><p> <span>bar</span> </p><p>baz\]</p>" compare innerHTML]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: FAIL
-
-  [[["stylewithcss","false"\],["italic",""\]\] "<span>[foo</span> <span>bar\]</span>" compare innerHTML]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661522
-    expected:
-      if (os == "linux") and debug: FAIL
-

 [italic.html?1001-2000]
  [[["stylewithcss","true"\],["italic",""\]\] "fo[o<em>bar</em>b\]az" compare innerHTML]