[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41903: Update toolchains for Firefox 156



Title: GitLab

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • af3b9d97
    by Nicolas Vigier at 2026-11-16T17:26:37+01:00
    Bug 41903: Update toolchains for Firefox 156
    

12 changed files:

Changes:

  • projects/application-services/config
    1 1
     # vim: filetype=yaml sw=2
    
    2
    -version: '155.0'
    
    2
    +version: '156.0'
    
    3 3
     git_hash: 'v[% c("version") %]-TORBROWSER-build[% c("var/build_number") %]'
    
    4 4
     git_url: https://gitlab.torproject.org/tpo/applications/application-services.git
    
    5 5
     tag_gpg_id: 1
    
    ... ... @@ -90,7 +90,7 @@ steps:
    90 90
             project: application-services
    
    91 91
             pkg_type: cargo_vendor
    
    92 92
             norec:
    
    93
    -          sha256sum: 30006ba4109a8011c951757235209ddf3b40aff92f793312c7ee84e8f03ca1bf
    
    93
    +          sha256sum: 19160c9bca5d0b1b98f2a0041dd0334e2ff79f81022d9fad8a96ffc7e4a410b2
    
    94 94
             enable: '[% !c("var/generate_gradle_dependencies_list") %]'
    
    95 95
           - filename: gen-gradle-deps-file.py
    
    96 96
             enable: '[% c("var/generate_gradle_dependencies_list") %]'
    

  • projects/firefox/config
    ... ... @@ -18,13 +18,13 @@ container:
    18 18
       use_container: 1
    
    19 19
     
    
    20 20
     var:
    
    21
    -  firefox_platform_version: '155.0a1'
    
    21
    +  firefox_platform_version: '156.0a1'
    
    22 22
       firefox_version: '[% c("var/firefox_platform_version") %]'
    
    23 23
       browser_series: '17.0'
    
    24
    -  browser_rebase: 1
    
    24
    +  browser_rebase: 2
    
    25 25
       browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
    
    26 26
       browser_build: 1
    
    27
    -  upstream_firefox_commit: FIREFOX_NIGHTLY_155_END
    
    27
    +  upstream_firefox_commit: FIREFOX_NIGHTLY_156_END
    
    28 28
       copyright_year: '[% exec("git show -s --format=%ci " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]'
    
    29 29
       nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
    
    30 30
       gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
    

  • projects/geckoview/config
    ... ... @@ -21,10 +21,10 @@ container:
    21 21
         build_apk: '[% !c("var/online_build") %]'
    
    22 22
     
    
    23 23
     var:
    
    24
    -  firefox_platform_version: '155.0a1'
    
    24
    +  firefox_platform_version: '156.0a1'
    
    25 25
       geckoview_version: '[% c("var/firefox_platform_version") %]'
    
    26 26
       browser_series: '17.0'
    
    27
    -  browser_rebase: 1
    
    27
    +  browser_rebase: 2
    
    28 28
       browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
    
    29 29
       browser_build: 1
    
    30 30
       gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
    
    ... ... @@ -38,7 +38,7 @@ var:
    38 38
         - python3-zstandard
    
    39 39
         - pkg-config
    
    40 40
         - openjdk-17-jdk-headless
    
    41
    -  gradle_version: 9.7.0
    
    41
    +  gradle_version: 9.7.1
    
    42 42
       glean_parser: 20.1.0
    
    43 43
       # python/mozboot/mozboot/android.py
    
    44 44
       bundletool_version: 1.18.3
    

  • projects/gradle/config
    ... ... @@ -12,7 +12,7 @@ var:
    12 12
         export PATH=$PATH:$GRADLE_HOME/bin
    
    13 13
       gradle_sha256sum:
    
    14 14
         8.14.3: bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
    
    15
    -    9.7.0: 84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
    
    15
    +    9.7.1: acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
    
    16 16
     
    
    17 17
     input_files:
    
    18 18
       - project: container-image
    

  • projects/llvm-project/config
    1 1
     # vim: filetype=yaml sw=2
    
    2
    -version: "21.1.8"
    
    3
    -git_hash: 2078da43e25a4623cab2d0d60decddf709aaea28
    
    2
    +version: "22.1.8"
    
    3
    +git_hash: ca7933e47d3a3451d81e72ac174dcb5aa28b59d1
    
    4 4
     git_url: https://github.com/llvm/llvm-project
    
    5 5
     filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    
    6 6
     
    

  • projects/mingw-w64-clang/build
    ... ... @@ -14,7 +14,6 @@ cd $builddir
    14 14
     tar -xf $rootdir/[% c('input_files_by_name/llvm-project') %]
    
    15 15
     
    
    16 16
     cd $builddir/clang-source
    
    17
    -patch -p1 < "$rootdir/mingw-libunwind-seh.patch"
    
    18 17
     
    
    19 18
     # libc++.a depends on libunwind.a. While the linker will automatically link to
    
    20 19
     # libc++.a in C++ mode, it won't pick libunwind.a, requiring the caller to
    

  • projects/mingw-w64-clang/config
    ... ... @@ -38,6 +38,3 @@ input_files:
    38 38
       - filename: mingw-ts_sd.patch
    
    39 39
       - filename: mingw-foundation_redef.patch
    
    40 40
       - filename: mingw-webrtc.patch
    41
    -  # Remove when switching to Clang 22.
    
    42
    -  # See Firefox's 9c6b4642907950bd9e3f663fbb7fcb0a16218232
    
    43
    -  - filename: mingw-libunwind-seh.patch

  • projects/mingw-w64-clang/mingw-libunwind-seh.patch deleted
    1
    -From 0991d7b8fd01546aaf537a6238227100570f8236 Mon Sep 17 00:00:00 2001
    
    2
    -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@xxxxxxxxx>
    
    3
    -Date: Thu, 12 Feb 2026 00:31:09 +0200
    
    4
    -Subject: [PATCH] [libunwind] Fix building with EXCEPTION_DISPOSITION as enum
    
    5
    - (#180513)
    
    6
    -
    
    7
    -On Windows, libunwind is normally only built in mingw mode; it's not
    
    8
    -relevant for MSVC targets. (Attempting to build it is entirely blocked
    
    9
    -in CMake, see [1]).
    
    10
    -
    
    11
    -In mingw headers, the type EXCEPTION_DISPOSITION is defined as an int
    
    12
    -while it is an enum in the MSVC vcruntime headers.
    
    13
    -
    
    14
    -However, in addition to the canonical enum members, we also use a value
    
    15
    -which has no assigned enum member. In older mingw-w64 headers, there was
    
    16
    -a define for this value, 4, with the name ExceptionExecuteHandler, but
    
    17
    -that was removed in [2]. The libunwind code reference this value just by
    
    18
    -the literal value 4, with a comment referencing it as
    
    19
    -ExceptionExecuteHandler.
    
    20
    -
    
    21
    -This extra enum value isn't passed to the outside Microsoft runtime, but
    
    22
    -is only used to pass values from one part of libunwind to another; this
    
    23
    -handling is necessary for the forced_unwind{1-3}.pass.cpp tests to
    
    24
    -succeed.
    
    25
    -
    
    26
    -If the mingw-w64 headers would define EXCEPTION_DISPOSITION as an enum,
    
    27
    -just like the MSVC vcruntime headers, then we'd run into build errors
    
    28
    -and warnings like this:
    
    29
    -
    
    30
    -    llvm-project/libunwind/src/Unwind-seh.cpp:166:14: error: cannot initialize return object of type 'EXCEPTION_DISPOSITION' (aka 'enum _EXCEPTION_DISPOSITION') with an rvalue of type 'int'
    
    31
    -          166 |       return 4 /* ExceptionExecuteHandler in mingw */;
    
    32
    -              |              ^
    
    33
    -    llvm-project/libunwind/src/Unwind-seh.cpp:185:14: error: cannot initialize return object of type 'EXCEPTION_DISPOSITION' (aka 'enum _EXCEPTION_DISPOSITION') with an rvalue of type 'int'
    
    34
    -          185 |       return 4 /* ExceptionExecuteHandler in mingw */;
    
    35
    -              |              ^
    
    36
    -    llvm-project/libunwind/src/Unwind-seh.cpp:272:8: warning: case value not in enumerated type 'EXCEPTION_DISPOSITION' (aka 'enum _EXCEPTION_DISPOSITION') [-Wswitch]
    
    37
    -          272 |   case 4 /*ExceptionExecuteHandler*/:
    
    38
    -              |        ^
    
    39
    -
    
    40
    -Fix these cases by adding explicit casts between EXCEPTION_DISPOSITION
    
    41
    -and int.
    
    42
    -
    
    43
    -A (partial) similar change was proposed in [3], but the author never
    
    44
    -followed up on the discussion, and the PR was later closed.
    
    45
    -
    
    46
    -[1] b0b546d44777eb1fa25995384876bd14a006a929
    
    47
    -[2] https://github.com/mingw-w64/mingw-w64/commit/2de6703961c0d519046b841f7b392a040e1e5b55
    
    48
    -[3] https://github.com/llvm/llvm-project/pull/159293
    
    49
    ----
    
    50
    - libunwind/src/Unwind-seh.cpp | 13 ++++++-------
    
    51
    - 1 file changed, 6 insertions(+), 7 deletions(-)
    
    52
    -
    
    53
    -diff --git a/libunwind/src/Unwind-seh.cpp b/libunwind/src/Unwind-seh.cpp
    
    54
    -index 110c5987c3f1..0b1930b44d1c 100644
    
    55
    ---- a/libunwind/src/Unwind-seh.cpp
    
    56
    -+++ b/libunwind/src/Unwind-seh.cpp
    
    57
    -@@ -163,7 +163,7 @@ _GCC_specific_handler(PEXCEPTION_RECORD ms_exc, PVOID frame, PCONTEXT ms_ctx,
    
    58
    -     // If we were called by __libunwind_seh_personality(), indicate that
    
    59
    -     // a handler was found; otherwise, initiate phase 2 by unwinding.
    
    60
    -     if (ours && ms_exc->NumberParameters > 1)
    
    61
    --      return 4 /* ExceptionExecuteHandler in mingw */;
    
    62
    -+      return static_cast<EXCEPTION_DISPOSITION>(4);
    
    63
    -     // This should never happen in phase 2.
    
    64
    -     if (IS_UNWINDING(ms_exc->ExceptionFlags))
    
    65
    -       _LIBUNWIND_ABORT("Personality indicated exception handler in phase 2!");
    
    66
    -@@ -182,7 +182,7 @@ _GCC_specific_handler(PEXCEPTION_RECORD ms_exc, PVOID frame, PCONTEXT ms_ctx,
    
    67
    -     // a handler was found; otherwise, it's time to initiate a collided
    
    68
    -     // unwind to the target.
    
    69
    -     if (ours && !IS_UNWINDING(ms_exc->ExceptionFlags) && ms_exc->NumberParameters > 1)
    
    70
    --      return 4 /* ExceptionExecuteHandler in mingw */;
    
    71
    -+      return static_cast<EXCEPTION_DISPOSITION>(4);
    
    72
    -     // This should never happen in phase 1.
    
    73
    -     if (!IS_UNWINDING(ms_exc->ExceptionFlags))
    
    74
    -       _LIBUNWIND_ABORT("Personality installed context during phase 1!");
    
    75
    -@@ -259,13 +259,12 @@ __libunwind_seh_personality(int version, _Unwind_Action state,
    
    76
    -                              (void *)disp_ctx->LanguageHandler, (void *)&ms_exc,
    
    77
    -                              (void *)disp_ctx->EstablisherFrame,
    
    78
    -                              (void *)disp_ctx->ContextRecord, (void *)disp_ctx);
    
    79
    --  EXCEPTION_DISPOSITION ms_act = disp_ctx->LanguageHandler(&ms_exc,
    
    80
    --                                                           (PVOID)disp_ctx->EstablisherFrame,
    
    81
    --                                                           disp_ctx->ContextRecord,
    
    82
    --                                                           disp_ctx);
    
    83
    -+  int ms_act = static_cast<int>(
    
    84
    -+      disp_ctx->LanguageHandler(&ms_exc, (PVOID)disp_ctx->EstablisherFrame,
    
    85
    -+                                disp_ctx->ContextRecord, disp_ctx));
    
    86
    -   _LIBUNWIND_TRACE_UNWINDING("__libunwind_seh_personality() LanguageHandler "
    
    87
    -                              "returned %d",
    
    88
    --                             (int)ms_act);
    
    89
    -+                             ms_act);
    
    90
    -   switch (ms_act) {
    
    91
    -   case ExceptionContinueExecution: return _URC_END_OF_STACK;
    
    92
    -   case ExceptionContinueSearch: return _URC_CONTINUE_UNWIND;
    
    93
    --- 
    
    94
    -2.53.0
    
    95
    -

  • projects/rust/config
    1 1
     # vim: filetype=yaml sw=2
    
    2 2
     filename: '[% project %]-[% c("version") %]-[% c("var/filename_targets") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    
    3
    -version: '1.94.1'
    
    3
    +version: '1.95.0'
    
    4 4
     container:
    
    5 5
       use_container: 1
    
    6 6
     
    

  • projects/wasi-sysroot/build
    ... ... @@ -12,6 +12,9 @@ make \
    12 12
       NINJA_FLAGS='-j[% c("num_procs") %]'
    
    13 13
     
    
    14 14
     mv build/install/wasi/share/wasi-sysroot/* $distdir/
    
    15
    +# Add wasip1 directories to wasi sysroot and compiler-rt.
    
    16
    +# See firefox commit 630a929dcf8de5f46d3affe52607ed588276393a
    
    17
    +cp -r $distdir/lib/wasm32-wasi $distdir/lib/wasm32-wasip1
    
    15 18
     
    
    16 19
     cd /var/tmp/dist
    
    17 20
     [% c('tar', {
    

  • projects/wasi-sysroot/build_compiler_rt
    ... ... @@ -12,6 +12,9 @@ make \
    12 12
     rtdir=/var/tmp/dist/clang/lib/clang/[% pc("llvm-project", "var/llvm_major") %]/lib/wasi
    
    13 13
     mkdir -p $rtdir
    
    14 14
     mv build/compiler-rt/lib/wasi/* $rtdir/
    
    15
    +# Add wasip1 directories to wasi sysroot and compiler-rt.
    
    16
    +# See firefox commit 630a929dcf8de5f46d3affe52607ed588276393a
    
    17
    +cp -r $rtdir "$rtdir/../wasip1"
    
    15 18
     
    
    16 19
     cd /var/tmp/dist
    
    17 20
     [% c('tar', {
    

  • projects/wasi-sysroot/wasi-sdk.patch
    ... ... @@ -64,7 +64,7 @@ index f350ecb..3b73115 100644
    64 64
      	@# TODO: As of clang 16, __GNUC_VA_LIST is #defined without a value.
    
    65 65
      	$(CC) $(CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \
    
    66 66
      	    -isystem $(SYSROOT_INC) \
    
    67
    -@@ -691,6 +701,11 @@ check-symbols: startup_files libc
    
    67
    +@@ -691,6 +701,12 @@ check-symbols: startup_files libc
    
    68 68
      	    -U__clang_wide_literal_encoding__ \
    
    69 69
      	    -U__wasm_mutable_globals__ \
    
    70 70
      	    -U__wasm_sign_ext__ \
    
    ... ... @@ -73,10 +73,11 @@ index f350ecb..3b73115 100644
    73 73
     +	    -U__wasm_nontrapping_fptoint__ \
    
    74 74
     +	    $(if $(filter-out wasm32-wasi-threads,$(TARGET_TRIPLE)),-U__wasm_bulk_memory__) \
    
    75 75
     +	    -U__wasm_bulk_memory_opt__ \
    
    76
    ++	    -U__wasip1__ \
    
    76 77
      	    -U__GNUC__ \
    
    77 78
      	    -U__GNUC_MINOR__ \
    
    78 79
      	    -U__GNUC_PATCHLEVEL__ \
    
    79
    -@@ -702,6 +717,13 @@ check-symbols: startup_files libc
    
    80
    +@@ -702,6 +718,13 @@ check-symbols: startup_files libc
    
    80 81
      	    | sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \
    
    81 82
      	    | grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \
    
    82 83
      	    | grep -v '^#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_\(1\|2\|4\|8\)' \
    

  • _______________________________________________
    tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
    To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx