From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:27 +0200 Subject: Adding upstream version 125.0.1. Signed-off-by: Daniel Baumann --- taskcluster/scripts/misc/afl-nyx.patch | 35 +++++++++++++ taskcluster/scripts/misc/are-we-esmified-yet.py | 5 +- taskcluster/scripts/misc/build-custom-car.sh | 2 +- taskcluster/scripts/misc/build-libxml2.sh | 59 ++++++++++++++++++++++ taskcluster/scripts/misc/build-llvm-common.sh | 4 +- taskcluster/scripts/misc/fetch-content | 19 +++++++ .../scripts/misc/repack-android-emulator-linux.sh | 9 +++- .../scripts/misc/repack-android-sdk-linux.sh | 9 +++- taskcluster/scripts/misc/vs-setup.sh | 2 +- taskcluster/scripts/misc/wasi-sdk.patch | 10 ++++ 10 files changed, 145 insertions(+), 9 deletions(-) create mode 100755 taskcluster/scripts/misc/build-libxml2.sh (limited to 'taskcluster/scripts/misc') diff --git a/taskcluster/scripts/misc/afl-nyx.patch b/taskcluster/scripts/misc/afl-nyx.patch index 67b460900c..94a1bbb31d 100644 --- a/taskcluster/scripts/misc/afl-nyx.patch +++ b/taskcluster/scripts/misc/afl-nyx.patch @@ -16,3 +16,38 @@ index 988e536e..5e9870c0 100644 +#define MAP_SIZE_POW2 23 /* Do not change this unless you really know what you are doing. */ + +diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c +index caa3c3a8..76ceb451 100644 +--- a/instrumentation/afl-compiler-rt.o.c ++++ b/instrumentation/afl-compiler-rt.o.c +@@ -1837,7 +1837,7 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg, + + } + +- if (pc_filter) { ++ if (pc_filter && !mod_info->next) { + + char PcDescr[1024]; + // This function is a part of the sanitizer run-time. +@@ -1864,7 +1864,7 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg, + + } + +- if (__afl_filter_pcs && strstr(mod_info->name, __afl_filter_pcs_module)) { ++ if (__afl_filter_pcs && !mod_info->next && strstr(mod_info->name, __afl_filter_pcs_module)) { + + u32 result_index; + if (locate_in_pcs(PC, &result_index)) { +@@ -1889,7 +1889,11 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg, + + } + +- mod_info->mapped = 1; ++ if (__afl_pcmap_ptr) { ++ ++ mod_info->mapped = 1; ++ ++ } + + if (__afl_debug) { diff --git a/taskcluster/scripts/misc/are-we-esmified-yet.py b/taskcluster/scripts/misc/are-we-esmified-yet.py index ff888b80c7..9723565dfc 100644 --- a/taskcluster/scripts/misc/are-we-esmified-yet.py +++ b/taskcluster/scripts/misc/are-we-esmified-yet.py @@ -30,7 +30,6 @@ excluded_files = [ "js/xpconnect/tests/unit/not-esmified-not-exported.jsm", "js/xpconnect/tests/unit/recursive_importA.jsm", "js/xpconnect/tests/unit/recursive_importB.jsm", - "js/xpconnect/tests/unit/ReturnCodeChild.jsm", "js/xpconnect/tests/unit/syntax_error.jsm", "js/xpconnect/tests/unit/TestBlob.jsm", "js/xpconnect/tests/unit/TestFile.jsm", @@ -112,12 +111,12 @@ def collect_jsm(files): # js files with EXPORTED_SYMBOLS if mode == "hg": - cmd = ["hg", "files", "set:grep('EXPORTED_SYMBOLS = \[') and glob:**/*.js"] + cmd = ["hg", "files", r"set:grep('EXPORTED_SYMBOLS = \[') and glob:**/*.js"] for line in run(cmd): put_file(files, kind, pathlib.Path(line)) else: handled = {} - cmd = ["git", "grep", "EXPORTED_SYMBOLS = \[", "*.js"] + cmd = ["git", "grep", r"EXPORTED_SYMBOLS = \[", "*.js"] for line in run(cmd): m = re.search("^([^:]+):", line) if not m: diff --git a/taskcluster/scripts/misc/build-custom-car.sh b/taskcluster/scripts/misc/build-custom-car.sh index d95538cb0e..62c135c83e 100755 --- a/taskcluster/scripts/misc/build-custom-car.sh +++ b/taskcluster/scripts/misc/build-custom-car.sh @@ -106,7 +106,7 @@ if [[ $(uname -o) == "Msys" ]]; then pushd "$WINDOWSSDKDIR" mkdir -p Debuggers/x64/ popd - mv $MOZ_FETCHES_DIR/VS/VC/Redist/MSVC/14.38.33130/x64/Microsoft.VC143.CRT/* chrome_dll/system32/ + mv $MOZ_FETCHES_DIR/VS/VC/Redist/MSVC/14.38.33135/x64/Microsoft.VC143.CRT/* chrome_dll/system32/ mv "$WINDOWSSDKDIR/App Certification Kit/"* "$WINDOWSSDKDIR"/Debuggers/x64/ export WINDIR="$PWD/chrome_dll" diff --git a/taskcluster/scripts/misc/build-libxml2.sh b/taskcluster/scripts/misc/build-libxml2.sh new file mode 100755 index 0000000000..0770ba0e43 --- /dev/null +++ b/taskcluster/scripts/misc/build-libxml2.sh @@ -0,0 +1,59 @@ +#!/bin/bash +set -e -v -x + +mkdir -p $UPLOAD_DIR + +cd $MOZ_FETCHES_DIR/libxml2 + +export PATH="$MOZ_FETCHES_DIR/clang/bin:$PATH" + +# Building the .rc file requires some extra work, but we don't +# actually need it, so just remove its creation. +sed -i /libxml2\\.rc/d CMakeLists.txt + +cmake \ + -GNinja \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=Off \ + -DCMAKE_C_COMPILER=clang-cl \ + -DCMAKE_LINKER=lld-link \ + -DCMAKE_MT=llvm-mt \ + -DCMAKE_C_FLAGS="-fuse-ld=lld -Xclang -ivfsoverlay -Xclang $MOZ_FETCHES_DIR/vs/overlay.yaml -winsysroot $MOZ_FETCHES_DIR/vs" \ + -DCMAKE_EXE_LINKER_FLAGS="-winsysroot:$MOZ_FETCHES_DIR/vs" \ + -DCMAKE_SYSTEM_NAME=Windows \ + -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded \ + -DLIBXML2_WITH_C14N=OFF \ + -DLIBXML2_WITH_CATALOG=OFF \ + -DLIBXML2_WITH_DEBUG=OFF \ + -DLIBXML2_WITH_DOCB=OFF \ + -DLIBXML2_WITH_FTP=OFF \ + -DLIBXML2_WITH_HTML=OFF \ + -DLIBXML2_WITH_HTTP=OFF \ + -DLIBXML2_WITH_ICONV=OFF \ + -DLIBXML2_WITH_ICU=OFF \ + -DLIBXML2_WITH_ISO8859X=OFF \ + -DLIBXML2_WITH_LEGACY=OFF \ + -DLIBXML2_WITH_LZMA=OFF \ + -DLIBXML2_WITH_MEM_DEBUG=OFF \ + -DLIBXML2_WITH_MODULES=OFF \ + -DLIBXML2_WITH_PROGRAMS=OFF \ + -DLIBXML2_WITH_PUSH=OFF \ + -DLIBXML2_WITH_PYTHON=OFF \ + -DLIBXML2_WITH_READER=OFF \ + -DLIBXML2_WITH_RUN_DEBUG=OFF \ + -DLIBXML2_WITH_SCHEMATRON=OFF \ + -DLIBXML2_WITH_TESTS=OFF \ + -DLIBXML2_WITH_THREAD_ALLOC=OFF \ + -DLIBXML2_WITH_VALID=OFF \ + -DLIBXML2_WITH_WRITER=OFF \ + -DLIBXML2_WITH_XINCLUDE=OFF \ + -DLIBXML2_WITH_XPATH=OFF \ + -DLIBXML2_WITH_XPTR=OFF \ + -DLIBXML2_WITH_ZLIB=OFF \ + -DCMAKE_INSTALL_PREFIX=$PWD/libxml2 \ + -B build + +ninja -C build -v install + +tar -caf libxml2.tar.zst libxml2/ +cp libxml2.tar.zst $UPLOAD_DIR/ diff --git a/taskcluster/scripts/misc/build-llvm-common.sh b/taskcluster/scripts/misc/build-llvm-common.sh index 2dbf68d3ec..73efc5093d 100755 --- a/taskcluster/scripts/misc/build-llvm-common.sh +++ b/taskcluster/scripts/misc/build-llvm-common.sh @@ -130,9 +130,9 @@ case "$target" in ln -s "windows kits/10" $MOZ_FETCHES_DIR/vs/sdk EXTRA_CMAKE_FLAGS=" $EXTRA_CMAKE_FLAGS - -DMSVC_BASE=$MOZ_FETCHES_DIR/vs/vc/tools/msvc/14.29.30133 + -DMSVC_BASE=$MOZ_FETCHES_DIR/vs/vc/tools/msvc/14.39.33519 -DWINSDK_BASE=$MOZ_FETCHES_DIR/vs/sdk - -DWINSDK_VER=10.0.19041.0 + -DWINSDK_VER=10.0.22621.0 " fi ;; diff --git a/taskcluster/scripts/misc/fetch-content b/taskcluster/scripts/misc/fetch-content index 9e6a1f4ef0..6e7b625dce 100755 --- a/taskcluster/scripts/misc/fetch-content +++ b/taskcluster/scripts/misc/fetch-content @@ -188,6 +188,25 @@ def stream_download(url, sha256=None, size=None): ) if certifi else urllib.request.urlopen(url, timeout=60) as fh: if not url.endswith(".gz") and fh.info().get("Content-Encoding") == "gzip": fh = gzip.GzipFile(fileobj=fh) + else: + # when using gzip we can't compare size or length (inflated) against content-length (compressed) + content_length = fh.getheader("content-length") + if content_length: + try: + content_length = int(content_length) + except ValueError: + raise IntegrityError( + "content-length header for %s is not an integer; got %s" + % (url, content_length) + ) + if size: + if size != content_length: + raise IntegrityError( + "size mismatch on %s: wanted %d; content-length is %d" + % (url, size, content_length) + ) + else: + size = content_length while True: chunk = fh.read(65536) diff --git a/taskcluster/scripts/misc/repack-android-emulator-linux.sh b/taskcluster/scripts/misc/repack-android-emulator-linux.sh index a9745d7a1e..277e6dff09 100755 --- a/taskcluster/scripts/misc/repack-android-emulator-linux.sh +++ b/taskcluster/scripts/misc/repack-android-emulator-linux.sh @@ -11,12 +11,19 @@ cd $GECKO_PATH ./mach python python/mozboot/mozboot/android.py --emulator-only --no-interactive --list-packages # Bug 1868944: override emulator to a known working version -curl -L http://dl.google.com/android/repository/emulator-linux_x64-10696886.zip > /tmp/emulator.zip +curl --fail -L http://dl.google.com/android/repository/emulator-linux_x64-10696886.zip > /tmp/emulator.zip cd /builds/worker/.mozbuild/android-sdk-linux rm -rf emulator unzip /tmp/emulator.zip cd $GECKO_PATH +# Bug 1880925: override platform-tools to a known working version +curl --fail -L https://dl.google.com/android/repository/platform-tools_r34.0.5-linux.zip > /tmp/platform-tools.zip +cd /builds/worker/.mozbuild/android-sdk-linux +rm -rf platform-tools +unzip /tmp/platform-tools.zip +cd $GECKO_PATH + # Remove extra files we don't need rm -rfv /builds/worker/.mozbuild/android-sdk-linux/tools mkdir /builds/worker/.mozbuild/android-sdk-linux/system-images diff --git a/taskcluster/scripts/misc/repack-android-sdk-linux.sh b/taskcluster/scripts/misc/repack-android-sdk-linux.sh index 0042d17472..d2fe85a9b5 100755 --- a/taskcluster/scripts/misc/repack-android-sdk-linux.sh +++ b/taskcluster/scripts/misc/repack-android-sdk-linux.sh @@ -11,12 +11,19 @@ cd $GECKO_PATH ./mach python python/mozboot/mozboot/android.py --artifact-mode --no-interactive --list-packages # Bug 1869407: override emulator to a known working version -curl -L http://dl.google.com/android/repository/emulator-linux_x64-10696886.zip > /tmp/emulator.zip +curl --fail -L http://dl.google.com/android/repository/emulator-linux_x64-10696886.zip > /tmp/emulator.zip cd /builds/worker/.mozbuild/android-sdk-linux rm -rf emulator unzip /tmp/emulator.zip cd $GECKO_PATH +# Bug 1880925: override platform-tools to a known working version +curl --fail -L https://dl.google.com/android/repository/platform-tools_r34.0.5-linux.zip > /tmp/platform-tools.zip +cd /builds/worker/.mozbuild/android-sdk-linux +rm -rf platform-tools +unzip /tmp/platform-tools.zip +cd $GECKO_PATH + tar cavf $UPLOAD_DIR/android-sdk-linux.tar.zst -C /builds/worker/.mozbuild android-sdk-linux bundletool.jar ls -al $UPLOAD_DIR diff --git a/taskcluster/scripts/misc/vs-setup.sh b/taskcluster/scripts/misc/vs-setup.sh index 05eb219794..bef579b1e2 100644 --- a/taskcluster/scripts/misc/vs-setup.sh +++ b/taskcluster/scripts/misc/vs-setup.sh @@ -6,7 +6,7 @@ if [ ! -d "${VSPATH}/${VCDIR}" ]; then VCDIR=VC/Tools/MSVC/14.29.30133 fi if [ ! -d "${VSPATH}/${VCDIR}" ]; then - VCDIR=VC/Tools/MSVC/14.38.33130 + VCDIR=VC/Tools/MSVC/14.39.33519 fi SDKDIR="Windows Kits/10" SDK_VERSION=10.0.17134.0 diff --git a/taskcluster/scripts/misc/wasi-sdk.patch b/taskcluster/scripts/misc/wasi-sdk.patch index 9f7b6ad908..b9e26074d1 100644 --- a/taskcluster/scripts/misc/wasi-sdk.patch +++ b/taskcluster/scripts/misc/wasi-sdk.patch @@ -1,3 +1,13 @@ +diff --git a/llvm_version_major.sh b/llvm_version_major.sh +index 2e5d973..93fe9b0 100755 +--- a/llvm_version_major.sh ++++ b/llvm_version_major.sh +@@ -1,4 +1,4 @@ + #/bin/bash + LLVM_PROJ_DIR=${1:-./src/llvm-project} +-MAJOR=`grep "set(LLVM_VERSION_MAJOR" $LLVM_PROJ_DIR/llvm/CMakeLists.txt | awk '{print substr($2, 1, length($2) - 1)}'` ++MAJOR=`(grep "set(LLVM_VERSION_MAJOR" $LLVM_PROJ_DIR/llvm/CMakeLists.txt || grep "set(LLVM_VERSION_MAJOR" $LLVM_PROJ_DIR/cmake/Modules/LLVMVersion.cmake) | awk '{print substr($2, 1, length($2) - 1)}'` + echo $MAJOR diff --git a/Makefile b/Makefile index d2ccff6..95f395b 100644 --- a/Makefile -- cgit v1.2.3