Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 89 insertions, 53 deletions

diff --git a/taskcluster/ci/toolchain/android.yml b/taskcluster/ci/toolchain/android.yml
index ed8cef3dc1..3c76f7cad4 100644
--- a/taskcluster/ci/toolchain/android.yml
+++ b/taskcluster/ci/toolchain/android.yml
@@ -140,7 +140,7 @@ linux64-jdk-repack:
         toolchain-artifact: project/gecko/jdk/jdk-linux.tar.zst
         toolchain-alias: linux64-jdk
         toolchain-env:
-            JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.9+9"
+            JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.10+7"
 
 linux64-android-sdk-linux-repack:
     description: "Android SDK (Linux) repack toolchain build"
diff --git a/taskcluster/ci/toolchain/clang-tidy.yml b/taskcluster/ci/toolchain/clang-tidy.yml
index 8d357e8c82..02d089eca3 100644
--- a/taskcluster/ci/toolchain/clang-tidy.yml
+++ b/taskcluster/ci/toolchain/clang-tidy.yml
@@ -103,6 +103,7 @@ win64-clang-tidy:
         toolchain:
             - linux64-clang-17
             - vs-toolchain
+            - win64-libxml2
 
 linux64-clang-tidy-external:
     attributes:
diff --git a/taskcluster/ci/toolchain/clang.yml b/taskcluster/ci/toolchain/clang.yml
index 1223afd4e5..a9cf04e0b9 100644
--- a/taskcluster/ci/toolchain/clang.yml
+++ b/taskcluster/ci/toolchain/clang.yml
@@ -437,6 +437,7 @@ win64-clang-17-stage1:
         toolchain:
             - linux64-clang-17-stage1
             - vs-toolchain
+            - win64-libxml2
 
 win64-clang-17-raw:
     description: "Clang-cl 17 toolchain build"
@@ -467,6 +468,7 @@ win64-clang-17-raw:
             - win64-clang-17-stage1
             - win64-compiler-rt-17
             - vs-toolchain
+            - win64-libxml2
 
 win64-clang-17:
     description: "Clang-cl 17 toolchain build"
@@ -801,6 +803,7 @@ win64-clang-18-stage1:
         toolchain:
             - linux64-clang-18-stage1
             - vs-toolchain
+            - win64-libxml2
 
 win64-clang-18-raw:
     description: "Clang-cl 18 toolchain build"
@@ -831,6 +834,7 @@ win64-clang-18-raw:
             - win64-clang-18-stage1
             - win64-compiler-rt-18
             - vs-toolchain
+            - win64-libxml2
 
 win64-clang-18:
     description: "Clang-cl 18 toolchain build"
@@ -1207,6 +1211,7 @@ win64-clang-trunk-stage1:
         toolchain:
             - linux64-clang-trunk-stage1
             - vs-toolchain
+            - win64-libxml2
 
 win64-clang-trunk-raw:
     description: "Clang-cl trunk toolchain build"
@@ -1239,6 +1244,7 @@ win64-clang-trunk-raw:
             - win64-clang-trunk-stage1
             - win64-compiler-rt-trunk
             - vs-toolchain
+            - win64-libxml2
 
 win64-clang-trunk:
     description: "Clang-cl trunk toolchain build"
diff --git a/taskcluster/ci/toolchain/macos-sdk.yml b/taskcluster/ci/toolchain/macos-sdk.yml
index d3e2bc6493..60e4c231fd 100644
--- a/taskcluster/ci/toolchain/macos-sdk.yml
+++ b/taskcluster/ci/toolchain/macos-sdk.yml
@@ -46,3 +46,39 @@ macosx64-sdk-14.2:
             - macosx64-sdk
             - macosx64-sdk-toolchain
             - MacOSX14.2.sdk
+
+ios-sdk-17.4:
+    description: "iPhoneOS17.4 SDK"
+    treeherder:
+        symbol: TM(ios17.4)
+    # Because it's using an internal tooltool artifact, it can't be used as a local-toolchain for
+    # bootstrap. But we still want to use the same script as local-toolchains.
+    attributes:
+        local-toolchain: false
+    run:
+        script: private_local_toolchain.sh
+        arguments:
+            - unpack-sdk.py
+            - http://taskcluster/tooltool.mozilla-releng.net/sha512/7d9f1f1e0d4963fbafc8ec20ee604665e99d66699db2515f388b3b061aaab83349815e1ef862922f4f46ffbe1ac2d86fb00701802c7a9994c74f6e1d32894c34
+            - 7d9f1f1e0d4963fbafc8ec20ee604665e99d66699db2515f388b3b061aaab83349815e1ef862922f4f46ffbe1ac2d86fb00701802c7a9994c74f6e1d32894c34
+            - Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk
+        toolchain-artifact: project/gecko/mac-sdk/iPhoneOS17.4.sdk.tar.zst
+        toolchain-alias: ios-sdk
+
+ios-sim-sdk-17.4:
+    description: "iPhoneSimulator17.4 SDK"
+    treeherder:
+        symbol: TM(ios-sim-17.4)
+    # Because it's using an internal tooltool artifact, it can't be used as a local-toolchain for
+    # bootstrap. But we still want to use the same script as local-toolchains.
+    attributes:
+        local-toolchain: false
+    run:
+        script: private_local_toolchain.sh
+        arguments:
+            - unpack-sdk.py
+            - http://taskcluster/tooltool.mozilla-releng.net/sha512/7d9f1f1e0d4963fbafc8ec20ee604665e99d66699db2515f388b3b061aaab83349815e1ef862922f4f46ffbe1ac2d86fb00701802c7a9994c74f6e1d32894c34
+            - 7d9f1f1e0d4963fbafc8ec20ee604665e99d66699db2515f388b3b061aaab83349815e1ef862922f4f46ffbe1ac2d86fb00701802c7a9994c74f6e1d32894c34
+            - Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk
+        toolchain-artifact: project/gecko/mac-sdk/iPhoneSimulator17.4.sdk.tar.zst
+        toolchain-alias: ios-sim-sdk
diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml
index f19201bc1e..4424cf6e0b 100644
--- a/taskcluster/ci/toolchain/misc.yml
+++ b/taskcluster/ci/toolchain/misc.yml
@@ -387,7 +387,7 @@ browsertime:
         toolchain-artifact: public/build/browsertime.tar.zst
     fetches:
         toolchain:
-            - linux64-node-16
+            - linux64-node
 
 wrench-deps:
     description: "Downloads all the crates needed for building wrench"
@@ -524,9 +524,6 @@ win64-vs2019:
         resources:
             - build/vs/vs2019.yaml
         toolchain-artifact: project/gecko/vs/vs.tar.zst
-        toolchain-alias:
-            - vs
-            - vs-toolchain
 
 win64-vs2022:
     description: "VS 2022"
@@ -544,6 +541,9 @@ win64-vs2022:
         resources:
             - build/vs/vs2022.yaml
         toolchain-artifact: project/gecko/vs/vs.tar.zst
+        toolchain-alias:
+            - vs
+            - vs-toolchain
 
 linux64-afl-instrumentation-4.0:
     description: "AFL++ instrumentation toolchain build"
@@ -603,3 +603,17 @@ windows-rs:
             - artifact: windows-rs.tar.zst
               extract: false
               dest: ../artifacts
+
+win64-libxml2:
+    description: "libxml2 toolchain build"
+    treeherder:
+        symbol: TW64(libxml2)
+    run:
+        script: build-libxml2.sh
+        toolchain-artifact: public/build/libxml2.tar.zst
+    fetches:
+        fetch:
+            - libxml2
+        toolchain:
+            - linux64-clang-toolchain
+            - vs-toolchain
diff --git a/taskcluster/ci/toolchain/node.yml b/taskcluster/ci/toolchain/node.yml
index c1bc86254d..6ab3511aab 100644
--- a/taskcluster/ci/toolchain/node.yml
+++ b/taskcluster/ci/toolchain/node.yml
@@ -20,16 +20,6 @@ linux64-node-12:
         fetch:
             - nodejs-12-linux64
 
-linux64-node-16:
-    treeherder:
-        symbol: TL(node-16)
-    run:
-        toolchain-alias:
-            - linux64-node
-    fetches:
-        fetch:
-            - nodejs-16-linux64
-
 linux64-node-18:
     # The upstream prebuilt binary requires glibc 2.28, which is too recent for Ubuntu 18.04,
     # so we build our own that won't have that requirement.
@@ -38,6 +28,8 @@ linux64-node-18:
         symbol: TL(node-18)
     run:
         script: build-nodejs.sh
+        toolchain-alias:
+            - linux64-node
     fetches:
         fetch:
             - nodejs-18-source
@@ -45,70 +37,43 @@ linux64-node-18:
             - linux64-gcc-11
             - linux64-toolchain-sysroot
 
-macosx64-node-16:
+macosx64-node-18:
     treeherder:
-        symbol: TM(node-16)
+        symbol: TM(node-18)
     run:
         toolchain-alias:
             - macosx64-node
-    fetches:
-        fetch:
-            - nodejs-16-macosx64
 
-macosx64-node-18:
-    treeherder:
-        symbol: TM(node-18)
     fetches:
         fetch:
             - nodejs-18-macosx64
 
-macosx64-aarch64-node-16:
+macosx64-aarch64-node-18:
     treeherder:
-        symbol: TM(node-16-arm64)
+        symbol: TM(node-18-arm64)
     run:
         toolchain-alias:
             - macosx64-aarch64-node
     fetches:
         fetch:
-            - nodejs-16-macosx64-arm64
-
-macosx64-aarch64-node-18:
-    treeherder:
-        symbol: TM(node-18-arm64)
-    fetches:
-        fetch:
             - nodejs-18-macosx64-arm64
 
-win64-node-16:
+win64-node-18:
     treeherder:
-        symbol: TW64(node-16)
+        symbol: TW64(node-18)
     run:
         toolchain-alias:
             - win64-node
     fetches:
         fetch:
-            - nodejs-16-win64
-
-win64-node-18:
-    treeherder:
-        symbol: TW64(node-18)
-    fetches:
-        fetch:
             - nodejs-18-win64
 
-win32-node-16:
+win32-node-18:
     treeherder:
-        symbol: TW32(node-16)
+        symbol: TW32(node-18)
     run:
         toolchain-alias:
             - win32-node
     fetches:
         fetch:
-            - nodejs-16-win32
-
-win32-node-18:
-    treeherder:
-        symbol: TW32(node-18)
-    fetches:
-        fetch:
             - nodejs-18-win32
diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml
index 050e581247..62f4fd4747 100644
--- a/taskcluster/ci/toolchain/rust.yml
+++ b/taskcluster/ci/toolchain/rust.yml
@@ -11,12 +11,12 @@ job-defaults:
         script: repack_rust.py
         toolchain-artifact: public/build/rustc.tar.zst
 
-linux64-rust-1.70:
+linux64-rust-1.74:
     treeherder:
-        symbol: TL(rust-1.70)
+        symbol: TL(rust-1.74)
     run:
         arguments: [
-            '--channel', '1.70.0',
+            '--channel', '1.74.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -134,6 +134,20 @@ linux64-rust-macos-1.76:
         ]
         toolchain-alias: linux64-rust-macos
 
+linux64-rust-ios-1.76:
+    description: "rust repack with ios-cross support"
+    treeherder:
+        symbol: TL(rust-ios)
+    run:
+        arguments: [
+            '--channel', '1.76.0',
+            '--host', 'x86_64-unknown-linux-gnu',
+            '--target', 'x86_64-unknown-linux-gnu',
+            '--target', 'aarch64-apple-ios',
+            '--target', 'aarch64-apple-ios-sim',
+        ]
+        toolchain-alias: linux64-rust-ios
+
 linux64-rust-android-1.76:
     description: "rust repack with android-cross support"
     treeherder: