October 2021 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40347: Make the list of toolchain updates needed for firefox91
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 6c63cad7122da1bd3f9aae134d1d73f983a2984b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 5 10:57:19 2021 +0200 Bug 40347: Make the list of toolchain updates needed for firefox91 --- projects/firefox/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 07af41b..d5e1b2a 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -41,8 +41,7 @@ steps: list_toolchain_updates: git_url: https://github.com/mozilla/gecko-dev.git - # < 91.0a1 - git_hash: f351e19360729b351bfc7c1386d6e4ca4ea676e2 + git_hash: esr91 tag_gpg_id: 0 input_files: [] var:

1 0

[tor-browser-build/master] Bug 40044: Add proper .tar.gz extensions to lucetc/wasi-sdk filenames
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 6fa26ef9cb698f73a591955c6ad924b42a55561b Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 3 18:09:35 2021 +0000 Bug 40044: Add proper .tar.gz extensions to lucetc/wasi-sdk filenames --- projects/lucetc/config | 2 +- projects/wasi-sysroot/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/lucetc/config b/projects/lucetc/config index 1177b4f..9c96214 100644 --- a/projects/lucetc/config +++ b/projects/lucetc/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' version: '[% c("abbrev") %]' git_hash: a0a1ce981638109f1f76cd1eecf17a0436a20055 git_url: https://github.com/PLSysSec/lucet_sandbox_compiler/ diff --git a/projects/wasi-sysroot/config b/projects/wasi-sysroot/config index c4ded87..683f682 100644 --- a/projects/wasi-sysroot/config +++ b/projects/wasi-sysroot/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' version: '[% c("abbrev") %]' git_hash: 5225b05436ce57f01fe649f411f3ff701246628b git_url: https://github.com/CraneStation/wasi-sdk

1 0

[tor-browser-build/master] Bug 40222: Bump GCC to 10.3.0 for Linux
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit a730b8dd332eacbcdbadd41fccc0d081a8bcb0b8 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 31 19:27:24 2021 +0000 Bug 40222: Bump GCC to 10.3.0 for Linux --- projects/firefox/abicheck.cc | 6 +++--- projects/gcc/config | 4 ++-- projects/tor/build | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/firefox/abicheck.cc b/projects/firefox/abicheck.cc index 53d1dcc..52e87d9 100644 --- a/projects/firefox/abicheck.cc +++ b/projects/firefox/abicheck.cc @@ -3,9 +3,9 @@ * This program is useful in determining if the libstdc++.so.6 installed * on the system is recent enough. Specifically, this program requires * `GLIBCXX_3.4.28` which should be provided by libstdc++.so.6 from - * gcc >= 9.3.0. If the program executes successfully, that means we - * should use the system version of libstdc++.so.6 and if not, that means - * we should use the bundled version. + * GCC >= 9.3.0 (we are good here as well with GCC 10.2.0). If the program + * executes successfully, that means we should use the system version of + * libstdc++.so.6 and if not, that means we should use the bundled version. * * We use std::pmr::monotonic_buffer_resource in order to require * GLIBCXX_3.4.28: diff --git a/projects/gcc/config b/projects/gcc/config index c515b19..b8ab369 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -3,7 +3,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' # Note: When updating the gcc version, if this includes a libstdc++ # ABI change we should also update projects/firefox/abicheck.cc to # require the new version. -version: 9.3.0 +version: 10.3.0 var: container: use_container: 1 @@ -54,4 +54,4 @@ targets: input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.xz' - sha256sum: 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 + sha256sum: 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344 diff --git a/projects/tor/build b/projects/tor/build index 0d81087..9c46910 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -65,7 +65,7 @@ openssldir=/var/tmp/dist/openssl/openssl mkdir -p $libstdc_dir cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 $libstdc_dir/ [% IF c("var/asan") -%] - cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.5 "$distdir/Tor/" + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.6 "$distdir/Tor/" cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.1 "$distdir/Tor/" [% END -%] chmod 700 "$distdir"/Tor/*.so*

1 0

[tor-browser-build/master] Bug 40357: Update binutils to 2.35.2
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit e5c24f4fac0df35aa3c96f6abea187bbf9f6d7d1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 2 10:43:22 2021 +0200 Bug 40357: Update binutils to 2.35.2 --- projects/binutils/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/binutils/config b/projects/binutils/config index 9fe4496..86aaf29 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.35.1 +version: 2.35.2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins'

1 0

[tor-browser-build/master] Bug 40336: Delete snowflake config option
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 098fc5e1057a2eedc0297e0bd47e83992d2da62d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 2 12:20:02 2021 +0200 Bug 40336: Delete snowflake config option Since snowflake is now enabled everywhere, we don't need the config option anymore. --- ...01-Revert-Bug-30318-Add-snowflake-support.patch | 78 ---------------------- projects/tor-android-service/build | 3 - projects/tor-android-service/config | 2 - projects/tor-browser/build | 11 +-- projects/tor-browser/config | 2 +- projects/tor-onion-proxy-library/build | 28 +++----- projects/tor-onion-proxy-library/config | 5 -- rbm.conf | 12 ---- 8 files changed, 11 insertions(+), 130 deletions(-) diff --git a/projects/tor-android-service/0001-Revert-Bug-30318-Add-snowflake-support.patch b/projects/tor-android-service/0001-Revert-Bug-30318-Add-snowflake-support.patch deleted file mode 100644 index b7be2ae..0000000 --- a/projects/tor-android-service/0001-Revert-Bug-30318-Add-snowflake-support.patch +++ /dev/null @@ -1,78 +0,0 @@ -From f3cf622e537a1283b821b3f3ce8e396a01bcb84b Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Sat, 16 Jan 2021 20:56:30 +0000 -Subject: [PATCH] Revert "Bug 30318: Add snowflake support" - -This reverts commit ecc251d0a73f7e2034a271efd28036a0108b8688. - -diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt -index 1525eba..fe37735 100644 ---- a/service/src/main/assets/common/bridges.txt -+++ b/service/src/main/assets/common/bridges.txt -@@ -13,5 +13,3 @@ obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0 - obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 - obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0 - meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com -- --snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72 -diff --git a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java -index 52bc4fe..198c981 100644 ---- a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java -+++ b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java -@@ -40,17 +40,14 @@ public class CustomTorInstaller extends TorInstaller { - @Override - public InputStream openBridgesStream() throws IOException { - /* -- BridgesList is an overloaded field, which can cause some confusion. -- The list can be: -- 1) a filter like obfs4, meek, or snowflake OR -- 2) it can be a custom bridge -- For (1), we just pass back all bridges, the filter will occur -- elsewhere in the library. -- For (2) we return the bridge list as a raw stream. -- If length is greater than 9, then we know this is a custom bridge -+ BridgesList is an overloaded field, which can cause some confusion. The list can be: -+ 1) a filter like obfs4 or meek OR 2) it can be a custom bridge -+ For (1), we just pass back all bridges, the filter will occur elsewhere in the library. -+ For (2) we return the bridge list as a raw stream -+ If length is greater than 5, then we know this is a custom bridge - */ - String userDefinedBridgeList = Prefs.getBridgesList(); -- byte bridgeType = (byte) (userDefinedBridgeList.length() > 9 ? 1 : 0); -+ byte bridgeType = (byte) (userDefinedBridgeList.length() > 5 ? 1 : 0); - // Terrible hack. Must keep in sync with topl::addBridgesFromResources. - if (bridgeType == 0) { - switch (userDefinedBridgeList) { -@@ -60,9 +57,6 @@ public class CustomTorInstaller extends TorInstaller { - case "meek": - bridgeType = 3; - break; -- case "snowflake": -- bridgeType = 4; -- break; - } - } - -diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java -index f1ddcda..32d7f30 100644 ---- a/service/src/main/java/org/torproject/android/service/TorService.java -+++ b/service/src/main/java/org/torproject/android/service/TorService.java -@@ -365,12 +365,10 @@ public final class TorService extends Service implements TorServiceConstants, Or - - //Check bridges to see if we need this - File nativeDir = new File(getApplicationInfo().nativeLibraryDir); -- File pluggableTransportObfs = new File(nativeDir, "libObfs4proxy.so"); -- if(!pluggableTransportObfs.canExecute()) pluggableTransportObfs.setExecutable(true); -- File pluggableTransportSnow = new File(nativeDir, "libSnowflake.so"); -- if(!pluggableTransportSnow.canExecute()) pluggableTransportSnow.setExecutable(true); -+ File pluggableTransport = new File(nativeDir, "libObfs4proxy.so"); -+ if(!pluggableTransport.canExecute()) pluggableTransport.setExecutable(true); - -- builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow); -+ builder.configurePluggableTransportsFromSettings(pluggableTransport); - mDataService.updateConfigBuilder(builder); - onionProxyManager.getTorInstaller().updateTorConfigCustom - (builder.asString()); --- -2.30.0 - diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 68d63cd..797d5c2 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -14,9 +14,6 @@ tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF ! c("var/snowflake") %] - patch -p1 < $rootdir/0001-Revert-Bug-30318-Add-snowflake-support.patch -[% END %] # Replace pre-packaged tor library with the latest build rm -fR service/src/main/jniLibs/* [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 171f4a9..c1ccb7d 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -25,8 +25,6 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - project: tor-onion-proxy-library name: topl - - filename: 0001-Revert-Bug-30318-Add-snowflake-support.patch - enable: '[% ! c("var/snowflake") %]' - project: tor name: tor-armv7 target_prepend: diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 1d2e35b..d2b8482 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -48,9 +48,7 @@ MARTOOLS=$rootdir/mar-tools mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %] -[% IF c("var/snowflake") %] - tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] -[% END -%] +tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %] @@ -135,12 +133,7 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" -[% IF ! c("var/snowflake") %] - grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> "$GENERATEDPREFSPATH" -[% ELSE %] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" -[% END %] +cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" [% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 09f77b2..4091361 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -75,7 +75,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: snowflake name: snowflake - enable: '[% c("var/snowflake") && ! c("var/android") %]' + enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index d4950f6..452d7e4 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -21,42 +21,30 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # build will pull down the correct android tool versions patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch -[% IF c("var/snowflake") %] - patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch -[% END %] +patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4-' _ arch) %] - [% IF c("var/snowflake") %] - # Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake - tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake-' _ arch) %] - [% END %] + # Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake + tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake-' _ arch) %] # Overwrite the obfs4proxy binary provided by Pluto and add Snowflake [% IF arch == "armv7" -%] cp obfs4proxy external/pluto/bin/armeabi-v7a/ cp obfs4proxy external/pluto/bin/armeabi/ - [% IF c("var/snowflake") %] - cp snowflake-client external/pluto/bin/armeabi-v7a/ - cp snowflake-client external/pluto/bin/armeabi/ - [% END %] + cp snowflake-client external/pluto/bin/armeabi-v7a/ + cp snowflake-client external/pluto/bin/armeabi/ [% ELSIF arch == "aarch64" -%] cp obfs4proxy external/pluto/bin/arm64-v8a/ - [% IF c("var/snowflake") %] - cp snowflake-client external/pluto/bin/arm64-v8a/ - [% END %] + cp snowflake-client external/pluto/bin/arm64-v8a/ [% ELSE -%] cp obfs4proxy external/pluto/bin/[% arch %]/ - [% IF c("var/snowflake") %] - cp snowflake-client external/pluto/bin/[% arch %]/ - [% END %] + cp snowflake-client external/pluto/bin/[% arch %]/ [% END -%] rm obfs4proxy - [% IF c("var/snowflake") %] - rm snowflake-client - [% END %] + rm snowflake-client [% END -%] # Build Android Libraries and Apps diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index f4a5c24..09f1bc7 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -42,26 +42,21 @@ input_files: name: snowflake-armv7 target_prepend: - android-armv7 - enable: '[% c("var/snowflake") %]' - project: snowflake name: snowflake-aarch64 target_prepend: - android-aarch64 - enable: '[% c("var/snowflake") %]' - project: snowflake name: snowflake-x86 target_prepend: - android-x86 - enable: '[% c("var/snowflake") %]' - project: snowflake name: snowflake-x86_64 target_prepend: - android-x86_64 - enable: '[% c("var/snowflake") %]' - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch - filename: 0001-Bug-30318-Add-snowflake-support.patch - enable: '[% c("var/snowflake") %]' diff --git a/rbm.conf b/rbm.conf index d231de1..63105ad 100644 --- a/rbm.conf +++ b/rbm.conf @@ -335,9 +335,6 @@ targets: android_min_api_aarch64: 21 # This is needed to get the offline build part for Glean right. glean_parser: 1.29.0 - # We only build snowflake on the alpha and nightly - # channels for now. - snowflake: '[% c("var/alpha") || c("var/nightly") %]' container: suite: buster arch: amd64 @@ -394,9 +391,6 @@ targets: linux: 1 compiler: gcc configure_opt: '[% c("var/configure_opt_project") %]' - # We only build snowflake on the alpha and nightly - # channels for now. - snowflake: '[% c("var/alpha") || c("var/nightly") %]' # Only build Namecoin for linux on nightly namecoin: '[% c("var/nightly") %]' container: @@ -456,9 +450,6 @@ targets: flag_mwindows: '-mwindows' compiler: mingw-w64 faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 - # We only build snowflake on the alpha and nightly - # channels for now. - snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - python @@ -486,9 +477,6 @@ targets: locale_ja: ja-JP-mac # We only support RLBox on the nightly channel for now rlbox: '[% c("var/nightly") %]' - # We only build snowflake on the alpha and nightly - # channels for now. - snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - python

1 0

[tor-browser-build/master] Bug 40305: Update Linux toolchain to switch to mozilla91
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit c2c853e787c5d736f37bed8fc3f7f3bece3ed95a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 8 16:59:17 2021 +0200 Bug 40305: Update Linux toolchain to switch to mozilla91 --- projects/clang/build | 21 +++++++++++---------- projects/clang/config | 3 +++ projects/firefox/build | 8 +++++--- projects/lucetc/build | 2 +- projects/lucetc/config | 7 ++++--- projects/rust/build | 3 +++ projects/rust/config | 3 +++ projects/wasi-sysroot/build | 11 +++++++---- projects/wasi-sysroot/config | 3 +-- projects/wasi-sysroot/no-git.patch | 28 ---------------------------- rbm.conf | 3 +++ 11 files changed, 41 insertions(+), 51 deletions(-) diff --git a/projects/clang/build b/projects/clang/build index 608d80c..41669b9 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -4,14 +4,13 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" -[% IF c("var/linux") || c("var/android") %] - [% IF c("var/linux") %] - # We need a link to our GCC, otherwise the system cc gets used which points - # to /usr/bin/gcc. - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), - hardened_gcc => 0 }) %] - ln -s gcc /var/tmp/dist/gcc/bin/cc - [% END %] +[% IF c("var/linux") %] + # We need a link to our GCC, otherwise the system cc gets used which points + # to /usr/bin/gcc. + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] + ln -s gcc /var/tmp/dist/gcc/bin/cc + [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] [% END -%] [% IF c("var/linux") || c("var/android") || c("var/windows") -%] tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] @@ -28,13 +27,15 @@ cd build [% IF ! c("var/ff91esr") %] cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE:STRING=Release \ - [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] + [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \ $LLVM_HOME [% ELSE %] cmake ../llvm -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE=Release \ + [% IF c("var/android") -%] -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ - [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] + [% END -%] + [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \ -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;lld" [% END -%] make -j[% c("buildconf/num_procs") %] diff --git a/projects/clang/config b/projects/clang/config index 3ce6d97..038a44b 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -36,3 +36,6 @@ input_files: - project: llvm-project name: clang-source enable: '[% c("var/ff91esr") %]' + - project: python + name: python + enable: '[% c("var/linux") %]' diff --git a/projects/firefox/build b/projects/firefox/build index eb2a663..732da0f 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -49,7 +49,7 @@ export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" rtdir=/var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi [% END-%] mkdir -p $rtdir - cp /var/tmp/dist/wasi-sysroot/lib/clang/9.0.0/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir + cp /var/tmp/dist/wasi-sysroot/lib/clang/11.0.0/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/lucetc') %] export PATH="/var/tmp/dist/lucetc/bin:$PATH" export WASM_SANDBOXED_LIBRARIES=graphite,ogg @@ -108,6 +108,8 @@ tar -C browser/extensions -xf $rootdir/[% c('input_files_by_name/tor-launcher') rm -f configure rm -f js/src/configure +export MACH_USE_SYSTEM_PYTHON=1 + # Android does not support --enable-bundled-fonts option ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/channel") %] --enable-bundled-fonts --with-branding=[% c("var/branding_directory") %] @@ -200,10 +202,10 @@ cd $distdir # No need for an unstripped geckodriver strip geckodriver [% END %] - mkdir -p $distdir/Debug/Browser/gtk2 + mkdir -p $distdir/Debug/Browser # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) - for LIB in Browser/*.so Browser/gtk2/*.so Browser/firefox.real Browser/plugin-container Browser/updater + for LIB in Browser/*.so Browser/firefox.real Browser/plugin-container Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB diff --git a/projects/lucetc/build b/projects/lucetc/build index e06c272..5ff071f 100644 --- a/projects/lucetc/build +++ b/projects/lucetc/build @@ -35,7 +35,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz # Now prepare the offline build # Move the directory for hardcoding the path in .cargo/config mv /var/tmp/build/[% project %]-[% c('version') %] $builddir -tar -C $builddir -xjf lucetc-vendor.tar.bz2 +tar -C $builddir -xf [% c('input_files_by_name/lucetc-vendor') %] cd $builddir # .cargo exists already, let's just add to it cat >> .cargo/config << 'EOF' diff --git a/projects/lucetc/config b/projects/lucetc/config index 9c96214..8de3a8e 100644 --- a/projects/lucetc/config +++ b/projects/lucetc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' version: '[% c("abbrev") %]' -git_hash: a0a1ce981638109f1f76cd1eecf17a0436a20055 +git_hash: d582d76bf0d17984501f3933688bf7a1eb5cf208 git_url: https://github.com/PLSysSec/lucet_sandbox_compiler/ git_submodule: 1 @@ -28,8 +28,9 @@ input_files: - name: wasi-sysroot project: wasi-sysroot # Use `make cargo_vendor-lucetc` to re-generate the vendor tarball - - URL: https://people.torproject.org/~gk/mirrors/sources/lucetc-vendor.tar.bz2 - sha256sum: 12ba97fca12177e7ed5b5409fcfdbd31dc7db2e82282768d99dee5bcb1b1246a + - name: lucetc-vendor + URL: 'https://people.torproject.org/~boklm/mirrors/sources/lucetc-vendor-[% c("version") %].tar.bz2' + sha256sum: 6b044ed76bc8870040174c8fbfa49c3a791b3aba7d32dd00cad541025eb16077 - filename: Remove-march-native-from-COMMON_CFLAGS.patch steps: diff --git a/projects/rust/build b/projects/rust/build index 3d68e61..722aacc 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -14,6 +14,9 @@ cd /var/tmp/dist/rust-[% c('var/previous_version') %]-x86_64-unknown-linux-gnu export PATH="$distdir-rust-old/bin:$PATH" [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% IF c("var/linux") -%] + [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] +[% END -%] [% IF c("var/osx") %] # We need to clear `CC` and `LDFLAGS` as they are used for the host platform diff --git a/projects/rust/config b/projects/rust/config index 55bf544..1e79687 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -96,6 +96,9 @@ input_files: sig_ext: asc file_gpg_id: 1 gpg_keyring: rust.gpg + - project: python + name: python + enable: '[% c("var/linux") %]' - filename: unwind.patch enable: '[% c("var/windows-i686") %]' - filename: 43909.patch diff --git a/projects/wasi-sysroot/build b/projects/wasi-sysroot/build index e66d1e0..8ab9524 100644 --- a/projects/wasi-sysroot/build +++ b/projects/wasi-sysroot/build @@ -21,13 +21,16 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz mv /var/tmp/build/[% project %]-[% c('version') %] $builddir cd $builddir -# We have no .git in our tar ball but the Makefile depends on that. Just -# hard-code the version for now. -patch -p1 < $rootdir/no-git.patch +# We have no .git in our tar ball but the script version.sh used by +# the Makefile depends on that. We replace the script. +cat > 'version.sh' << EOF +#!/bin/sh +echo '[% c("abbrev") %]' +EOF # XXX: We don't want to use the clang 9.0 wasi-sdk would use, see: # https://bugzilla.mozilla.org/show_bug.cgi?id=1605708 -make -j[% c("buildconf/num_procs") %] PREFIX=$distdir/[% project %] +make -j[% c("buildconf/num_procs") %] PREFIX=$distdir/[% project %] DESTDIR=/ cd $distdir [% c('tar', { diff --git a/projects/wasi-sysroot/config b/projects/wasi-sysroot/config index 683f682..96bf873 100644 --- a/projects/wasi-sysroot/config +++ b/projects/wasi-sysroot/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' version: '[% c("abbrev") %]' -git_hash: 5225b05436ce57f01fe649f411f3ff701246628b +git_hash: b36c433738f0c29160a5ac1c1cee1b1b884bf4a0 git_url: https://github.com/CraneStation/wasi-sdk git_submodule: 1 @@ -27,4 +27,3 @@ input_files: project: cmake - name: ninja project: ninja - - filename: no-git.patch diff --git a/projects/wasi-sysroot/no-git.patch b/projects/wasi-sysroot/no-git.patch deleted file mode 100644 index 27c3446..0000000 --- a/projects/wasi-sysroot/no-git.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 55a106779cd012f9cf5d6f46a7a3523de9ba93c3 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Sat, 7 Dec 2019 16:12:42 +0000 -Subject: [PATCH] No .git in our tarball - - -diff --git a/Makefile b/Makefile -index f09a901..dc114cb 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,11 +6,11 @@ LLVM_PROJ_DIR?=$(ROOT_DIR)/src/llvm-project - PREFIX?=/opt/wasi-sdk - - CLANG_VERSION=$(shell ./llvm_version.sh $(LLVM_PROJ_DIR)) --VERSION:=$(shell ./version.sh) --DEBUG_PREFIX_MAP=-fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION) -+#VERSION:=$(shell ./version.sh) -+DEBUG_PREFIX_MAP=-fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v8.1g5225b05436ce - - default: build -- @echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION)" -+ @echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v8.1g5225b05436ce" - - clean: - rm -rf build $(PREFIX) --- -2.24.0 - diff --git a/rbm.conf b/rbm.conf index d231de1..79f7917 100644 --- a/rbm.conf +++ b/rbm.conf @@ -369,13 +369,16 @@ targets: torbrowser-linux-x86_64: - linux-x86_64 - linux + - ff91esr torbrowser-linux-x86_64-asan: - linux-asan - linux-x86_64 - linux + - ff91esr torbrowser-linux-i686: - linux-i686 - linux + - ff91esr linux-x86_64: arch: x86_64 var:

1 0

[tor-browser-build/master] Bug 40353: Temporarily disable rlbox for linux builds
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 2028dfd8ace131a99f4d114786c3bc4cc3ec3765 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 18 18:04:52 2021 +0200 Bug 40353: Temporarily disable rlbox for linux builds --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 79f7917..b389872 100644 --- a/rbm.conf +++ b/rbm.conf @@ -385,7 +385,7 @@ targets: linux-x86_64: 1 osname: linux-x86_64 # We only support RLBox on the nightly channel and x86_64 for now - rlbox: '[% c("var/nightly") %]' + rlbox: 0 linux-i686: arch: i686 var:

1 0

[tor-browser-build/master] Bug 40466: Set ff91esr firefox version
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit bc634cbe6f545cd9f678c9eab7f5a140d24b916c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 20 14:26:53 2021 +0200 Bug 40466: Set ff91esr firefox version --- projects/firefox/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/firefox/config b/projects/firefox/config index d5e1b2a..a1de42c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -49,6 +49,11 @@ steps: use_container: 0 targets: + ff91esr: + var: + firefox_platform_version: 91.0.1 + firefox_version: '[% c("var/firefox_platform_version") %]' + release: var: branding_directory: 'browser/branding/official'

1 0

[tor-browser-build/master] Bug 40354: Add bullseye to projects/mmdebstrap-image/config
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 0a8ad5ede2a42523e9f4daff6213c11fca4f857c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 6 17:09:13 2021 +0200 Bug 40354: Add bullseye to projects/mmdebstrap-image/config --- projects/mmdebstrap-image/config | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/projects/mmdebstrap-image/config b/projects/mmdebstrap-image/config index 102053d..f326728 100644 --- a/projects/mmdebstrap-image/config +++ b/projects/mmdebstrap-image/config @@ -50,6 +50,13 @@ targets: suite: buster arch: amd64 + bullseye-amd64: + var: + minimal_apt_version: 2.2.4 + container: + suite: bullseye + arch: amd64 + input_files: - project: mmdebstrap name: mmdebstrap

1 0

[tor-browser-build/master] Bug 28240: switch from SJLJ exception handling to Dwarf2 in mingw for win32
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 29c88a91da1aac43a837ef39e7b5d4556d8e2c73 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Sep 19 09:25:39 2021 +0200 Bug 28240: switch from SJLJ exception handling to Dwarf2 in mingw for win32 --- projects/mingw-w64/build | 2 +- projects/mingw-w64/config | 2 +- projects/rust/build | 10 --- projects/rust/config | 2 - projects/rust/unwind.patch | 163 --------------------------------------------- 5 files changed, 2 insertions(+), 177 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 155c531..2d8e8e2 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -26,7 +26,7 @@ tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz # CFLAGS_FOR_TARGET. export CFLAGS_FOR_TARGET="-Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp [% c('var/flag_noSEH') %]" # Rust requires enabling pthreads -gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++ +gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++[% IF c("var/windows-i686") %] --disable-sjlj-exceptions --with-dwarf2[% END %] make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index c5dde82..6758997 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -19,7 +19,7 @@ var: targets: windows-i686: var: - libgcc_dll: libgcc_s_sjlj-1.dll + libgcc_dll: libgcc_s_dw2-1.dll arch_deps: - g++-mingw-w64-i686 windows-x86_64: diff --git a/projects/rust/build b/projects/rust/build index 722aacc..69bd0f4 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -58,16 +58,6 @@ cd /var/tmp/build/rustc-[% c('version') %]-src patch -p1 < $rootdir/fix-build-1.53.0.patch [% END %] -[% IF c("var/windows-i686") %] - # Cross-compiling for Windows 32bit is currently not possible without any - # patches. The reason for that is libstd expecting DWARF unwinding while most - # toolchains on Linux, targeting Windows 32bit, use SjLj unwinding. - # See: https://github.com/rust-lang/rust/issues/12859 for discussion about - # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to - # fix this problem. We apply the patch from neersighted. - patch -p1 < $rootdir/unwind.patch -[% END %] - mkdir build cd build ../configure --prefix=$distdir --disable-docs --disable-compiler-docs [% c("var/configure_opt") %] diff --git a/projects/rust/config b/projects/rust/config index 1e79687..01e1843 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -99,8 +99,6 @@ input_files: - project: python name: python enable: '[% c("var/linux") %]' - - filename: unwind.patch - enable: '[% c("var/windows-i686") %]' - filename: 43909.patch name: 43909 enable: '[% ! c("var/ff91esr") %]' diff --git a/projects/rust/unwind.patch b/projects/rust/unwind.patch deleted file mode 100644 index 65c51f9..0000000 --- a/projects/rust/unwind.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 90ddcca6235b5f24c57df6a648e8d489c7e3eae5 Mon Sep 17 00:00:00 2001 -From: Bjorn Neergaard <bjorn(a)neersighted.com> -Date: Sat, 9 Feb 2019 19:39:23 +0000 -Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux - -This is still very rough and serves as a proof-of-concept for fixing -Linux -> 32-bit MinGW cross compilation workflow. Currently, clang and -GCC's MinGW targets both only support DW2 (DWARF) or SJLJ (Set Jump Long -Jump) unwinding on 32-bit Windows. - -The default for GCC (and the way it is shipped on every major distro) is -to use SJLJ on Windows, as DWARF cannot traverse non-DWARF frames. This -would work fine, except for the fact that libgcc (our C runtime on the -MinGW platform) exports symbols under a different name when configured -to use SJLJ-style unwinding, and uses a preprocessor macro internally to -alias them. - -Because of this, we have to detect this scenario and link to the correct -symbols ourselves. Linking has been tested with a full bootstrap on both -x86_64-unknown-linux-gnu and i686-pc-windows-gnu, as well as -cross-compilation of some of my own projects. - -Obviously, the detection is a bit unrefined. Right now we -unconditionally use SJLJ when compiling Linux -> MinGW. I'd like to add -feature detection using compiler build flags or autotools-style -compilation and object analysis. Input on the best way to proceed here -is welcome. - -Also, currently there is copy-pasted/duplicated code in libunwind. -Ideally, this could be reduced, but this would likely require a -rethinking of how iOS is special-cased above, to avoid further -duplication. Input on how to best structure this file is requested. - -diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index 65a00db3394..e821507c341 100644 ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -207,6 +207,11 @@ pub fn std_cargo(builder: &Builder<'_>, target: Interned<String>, cargo: &mut Ca - let mut features = builder.std_features(); - features.push_str(&compiler_builtins_c_feature); - -+ // FIXME: Temporary detection of SJLJ MinGW compilers. -+ if builder.config.build.contains("linux") && target == "i686-pc-windows-gnu" { -+ features.push_str(" sjlj_eh"); -+ } -+ - cargo - .arg("--features") - .arg(features) -diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml -index b147aa55b2a..cad4d88caa2 100644 ---- a/src/libstd/Cargo.toml -+++ b/src/libstd/Cargo.toml -@@ -68,6 +68,7 @@ panic_immediate_abort = ["core/panic_immediate_abort"] - # https://github.com/rust-lang/stdarch/blob/master/crates/std_detect/Cargo.to… - std_detect_file_io = [] - std_detect_dlsym_getauxval = [] -+sjlj_eh = ["unwind/sjlj_eh"] - - [package.metadata.fortanix-sgx] - # Maximum possible number of threads when testing -diff --git a/src/libtest/Cargo.toml b/src/libtest/Cargo.toml -index 170fbb984cf..b1b0be71067 100644 ---- a/src/libtest/Cargo.toml -+++ b/src/libtest/Cargo.toml -@@ -29,3 +29,4 @@ llvm-libunwind = ["std/llvm-libunwind"] - panic-unwind = ["std/panic_unwind"] - panic_immediate_abort = ["std/panic_immediate_abort"] - profiler = ["std/profiler"] -+sjlj_eh = ["std/sjlj_eh"] -diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml -index 77bcfffd506..9d9fc5fbff5 100644 ---- a/src/libunwind/Cargo.toml -+++ b/src/libunwind/Cargo.toml -@@ -26,3 +26,4 @@ cc = { version = "1.0.1" } - - [features] - llvm-libunwind = [] -+sjlj_eh = [] -diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs -index 0c57861f70a..44c767ebfc5 100644 ---- a/src/libunwind/libunwind.rs -+++ b/src/libunwind/libunwind.rs -@@ -79,8 +79,8 @@ pub type _Unwind_Exception_Cleanup_Fn = - link(name = "unwind", kind = "static") - )] - extern "C" { -- #[unwind(allowed)] -- pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] - pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); - pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void; - pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr; -@@ -222,32 +222,50 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm - } // cfg_if! - - cfg_if::cfg_if! { --if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { -- // Not 32-bit iOS -- #[cfg_attr(all(feature = "llvm-libunwind", -- any(target_os = "fuchsia", target_os = "linux")), -- link(name = "unwind", kind = "static"))] -+if #[cfg(all(target_os = "ios", target_arch = "arm"))] { -+ // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() - extern "C" { -- #[unwind(allowed)] -- pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] -+ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; -+ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ } -+ -+ #[inline] -+ pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { -+ _Unwind_SjLj_RaiseException(exc) -+ } -+ -+} else if #[cfg(feature = "sjlj_eh")] { -+ extern "C" { -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] -+ pub fn _Unwind_SjLj_Resume(e: *mut _Unwind_Exception) -> !; -+ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; - pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, - trace_argument: *mut c_void) - -> _Unwind_Reason_Code; - } --} else { -- // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() -- #[cfg_attr(all(feature = "llvm-libunwind", -- any(target_os = "fuchsia", target_os = "linux")), -- link(name = "unwind", kind = "static"))] -- extern "C" { -- #[unwind(allowed)] -- pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ -+ #[inline] -+ pub unsafe fn _Unwind_Resume(exc: *mut _Unwind_Exception) -> ! { -+ _Unwind_SjLj_Resume(exc) - } - - #[inline] - pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { - _Unwind_SjLj_RaiseException(exc) - } -+} else { -+ extern "C" { -+ #[cfg_attr(stage0, unwind)] -+ #[cfg_attr(not(stage0), unwind(allowed))] -+ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; -+ pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; -+ pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, -+ trace_argument: *mut c_void) -+ -> _Unwind_Reason_Code; -+ } - } - } // cfg_if! - --- -2.28.0 -

1 0