- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40006: Adapt cbindgen for Firefox 78 ESR
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit f232e5d23544a7fbfa4b8f619a49315d370aca2b Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 14 11:12:40 2020 +0000 Bug 40006: Adapt cbindgen for Firefox 78 ESR --- projects/cbindgen/build | 2 +- projects/cbindgen/config | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/cbindgen/build b/projects/cbindgen/build index 429f567..2a1c9e0 100644 --- a/projects/cbindgen/build +++ b/projects/cbindgen/build @@ -11,7 +11,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 cbindgen-vendor.tar.bz2 +tar -C $builddir -xjf cbindgen-vendor-[% c('version') %].tar.bz2 cd $builddir mkdir .cargo cat > .cargo/config << 'EOF' diff --git a/projects/cbindgen/config b/projects/cbindgen/config index ddfb9f9..3dd94f6 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' +version: 0.14.1 git_url: https://github.com/eqrion/cbindgen -git_hash: 23a991a5b21e89aa1dcdc70f1371be20c93ece8e #v0.8.7 +git_hash: 0761b9bbe48d01ded1bbec45bbeea5544b3b1002 # v0.14.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -12,5 +12,5 @@ input_files: - name: rust project: rust # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources. - - URL: https://people.torproject.org/~boklm/mirrors/sources/cbindgen-vendor.tar.bz2 - sha256sum: f4cde3d56df893b543b35b7e4a6e295a275dbb3cee8e8eae549efe679db50ab9 + - URL: https://people.torproject.org/~gk/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 + sha256sum: 1c500bc1b8de4eb400f90a528c4b5c6b2c7357e401a95c5354469a18fd365dbc

1 0

[tor-browser-build/master] Bug 34387: Fix Namecoin patches for Firefox 78 ESR
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit f431cfcd39c4e6bec0094655206e94a495123bad Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 14 11:53:35 2020 +0000 Bug 34387: Fix Namecoin patches for Firefox 78 ESR --- projects/firefox/namecoin-etld.patch | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/projects/firefox/namecoin-etld.patch b/projects/firefox/namecoin-etld.patch index e2e49a5..a48383c 100644 --- a/projects/firefox/namecoin-etld.patch +++ b/projects/firefox/namecoin-etld.patch @@ -1,21 +1,8 @@ -diff --git a/mobile/android/app/src/main/assets/publicsuffixlist b/mobile/android/app/src/main/assets/publicsuffixlist -index 7f834b1a89bd..6874b4005ae3 100644 ---- a/mobile/android/app/src/main/assets/publicsuffixlist -+++ b/mobile/android/app/src/main/assets/publicsuffixlist -@@ -3005,6 +3005,8 @@ edu.mn - gov.mn - london - fashion -+onion -+bit.onion - creditunion - vision - eurovision diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index 0c53819d860d..469fb3d53ba1 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat -@@ -5497,6 +5497,7 @@ pro.om +@@ -5499,6 +5499,7 @@ pro.om onion tor.onion securedrop.tor.onion

1 0

[tor-browser-build/master] Bug 40004: Adapt Rust project for Firefox 78 ESR
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit d78cf48aa087db33bdf7a16c833a06d49551093e Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 14 11:02:03 2020 +0000 Bug 40004: Adapt Rust project for Firefox 78 ESR --- projects/rust/42574.patch | 236 ---------------------------------------------- projects/rust/build | 1 - projects/rust/config | 5 +- 3 files changed, 2 insertions(+), 240 deletions(-) diff --git a/projects/rust/42574.patch b/projects/rust/42574.patch deleted file mode 100644 index 285d254..0000000 --- a/projects/rust/42574.patch +++ /dev/null @@ -1,236 +0,0 @@ -From 3757213db371dcea53cae357cf9c56d1b0604f98 Mon Sep 17 00:00:00 2001 -From: Alina Sbirlea <asbirlea(a)google.com> -Date: Fri, 12 Jul 2019 22:30:30 +0000 -Subject: [PATCH] [MemorySSA] Use SetVector to avoid nondeterminism. - -Summary: -Use a SetVector for DeadBlockSet. -Resolves PR42574. - -Reviewers: george.burgess.iv, uabelho, dblaikie - -Subscribers: jlebar, Prazek, mgrang, llvm-commits - -Tags: #llvm - -Differential Revision: https://reviews.llvm.org/D64601 - -llvm-svn: 365970 - -diff --git a/llvm/include/llvm/Analysis/MemorySSAUpdater.h b/llvm/include/llvm/Analysis/MemorySSAUpdater.h -index 169d5bd9fa8..276620bd445 100644 ---- a/llvm/include/llvm/Analysis/MemorySSAUpdater.h -+++ b/llvm/include/llvm/Analysis/MemorySSAUpdater.h -@@ -32,6 +32,7 @@ - #ifndef LLVM_ANALYSIS_MEMORYSSAUPDATER_H - #define LLVM_ANALYSIS_MEMORYSSAUPDATER_H - -+#include "llvm/ADT/SetVector.h" - #include "llvm/ADT/SmallPtrSet.h" - #include "llvm/ADT/SmallSet.h" - #include "llvm/ADT/SmallVector.h" -@@ -239,7 +240,7 @@ public: - /// Deleted blocks still have successor info, but their predecessor edges and - /// Phi nodes may already be updated. Instructions in DeadBlocks should be - /// deleted after this call. -- void removeBlocks(const SmallPtrSetImpl<BasicBlock *> &DeadBlocks); -+ void removeBlocks(const SmallSetVector<BasicBlock *, 8> &DeadBlocks); - - /// Get handle on MemorySSA. - MemorySSA* getMemorySSA() const { return MSSA; } -diff --git a/llvm/lib/Analysis/MemorySSAUpdater.cpp b/llvm/lib/Analysis/MemorySSAUpdater.cpp -index 6c817d20368..a6c7142a697 100644 ---- a/llvm/lib/Analysis/MemorySSAUpdater.cpp -+++ b/llvm/lib/Analysis/MemorySSAUpdater.cpp -@@ -1101,7 +1101,7 @@ void MemorySSAUpdater::removeMemoryAccess(MemoryAccess *MA) { - } - - void MemorySSAUpdater::removeBlocks( -- const SmallPtrSetImpl<BasicBlock *> &DeadBlocks) { -+ const SmallSetVector<BasicBlock *, 8> &DeadBlocks) { - // First delete all uses of BB in MemoryPhis. - for (BasicBlock *BB : DeadBlocks) { - Instruction *TI = BB->getTerminator(); -diff --git a/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp b/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp -index 2e5927f9a06..f464df26a02 100644 ---- a/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp -+++ b/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp -@@ -388,8 +388,8 @@ private: - void deleteDeadLoopBlocks() { - DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Eager); - if (MSSAU) { -- SmallPtrSet<BasicBlock *, 8> DeadLoopBlocksSet(DeadLoopBlocks.begin(), -- DeadLoopBlocks.end()); -+ SmallSetVector<BasicBlock *, 8> DeadLoopBlocksSet(DeadLoopBlocks.begin(), -+ DeadLoopBlocks.end()); - MSSAU->removeBlocks(DeadLoopBlocksSet); - } - for (auto *BB : DeadLoopBlocks) { -diff --git a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp -index 5a67178cef3..814cf814989 100644 ---- a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp -+++ b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp -@@ -1436,8 +1436,8 @@ deleteDeadClonedBlocks(Loop &L, ArrayRef<BasicBlock *> ExitBlocks, - - // Remove all MemorySSA in the dead blocks - if (MSSAU) { -- SmallPtrSet<BasicBlock *, 16> DeadBlockSet(DeadBlocks.begin(), -- DeadBlocks.end()); -+ SmallSetVector<BasicBlock *, 8> DeadBlockSet(DeadBlocks.begin(), -+ DeadBlocks.end()); - MSSAU->removeBlocks(DeadBlockSet); - } - -@@ -1455,7 +1455,7 @@ static void deleteDeadBlocksFromLoop(Loop &L, - MemorySSAUpdater *MSSAU) { - // Find all the dead blocks tied to this loop, and remove them from their - // successors. -- SmallPtrSet<BasicBlock *, 16> DeadBlockSet; -+ SmallSetVector<BasicBlock *, 8> DeadBlockSet; - - // Start with loop/exit blocks and get a transitive closure of reachable dead - // blocks. -diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp -index 499e611acb5..83dabcd7952 100644 ---- a/llvm/lib/Transforms/Utils/Local.cpp -+++ b/llvm/lib/Transforms/Utils/Local.cpp -@@ -2211,7 +2211,7 @@ bool llvm::removeUnreachableBlocks(Function &F, LazyValueInfo *LVI, - assert(Reachable.size() < F.size()); - NumRemoved += F.size()-Reachable.size(); - -- SmallPtrSet<BasicBlock *, 16> DeadBlockSet; -+ SmallSetVector<BasicBlock *, 8> DeadBlockSet; - for (Function::iterator I = ++F.begin(), E = F.end(); I != E; ++I) { - auto *BB = &*I; - if (Reachable.count(BB)) -diff --git a/llvm/test/Analysis/MemorySSA/nondeterminism.ll b/llvm/test/Analysis/MemorySSA/nondeterminism.ll -new file mode 100644 -index 00000000000..0bb3df30b58 ---- /dev/null -+++ b/llvm/test/Analysis/MemorySSA/nondeterminism.ll -@@ -0,0 +1,122 @@ -+; RUN: opt -simplifycfg -enable-mssa-loop-dependency -S --preserve-ll-uselistorder %s | FileCheck %s -+; REQUIRES: x86-registered-target -+; CHECK-LABEL: @n -+; CHECK: uselistorder i16 0, { 3, 2, 4, 1, 5, 0, 6 } -+ -+; Note: test was added in an effort to ensure determinism when updating memoryssa. See PR42574. -+; If the uselistorder check becomes no longer relevant, the test can be disabled or removed. -+ -+%rec9 = type { i16, i32, i32 } -+ -+@a = global [1 x [1 x %rec9]] zeroinitializer -+ -+define i16 @n() { -+ br label %..split_crit_edge -+ -+..split_crit_edge: ; preds = %0 -+ br label %.split -+ -+bb4.us4: ; preds = %bb2.split.us32, %bb6.us28 -+ %i.4.01.us5 = phi i16 [ %_tmp49.us30, %bb6.us28 ] -+ br label %g.exit4.us21 -+ -+bb1.i.us14: ; preds = %bb4.us4 -+ br label %g.exit4.us21 -+ -+g.exit4.us21: ; preds = %bb1.i.us14, %g.exit4.critedge.us9 -+ %i.4.02.us22 = phi i16 [ %i.4.01.us5, %bb4.us4 ], [ %i.4.01.us5, %bb1.i.us14 ] -+ br label %bb6.us28 -+ -+bb5.us26: ; preds = %g.exit4.us21 -+ br label %bb6.us28 -+ -+bb6.us28: ; preds = %bb5.us26, %g.exit4.us21 -+ %i.4.03.us29 = phi i16 [ %i.4.02.us22, %bb5.us26 ], [ %i.4.02.us22, %g.exit4.us21 ] -+ %_tmp49.us30 = add nuw nsw i16 %i.4.03.us29, 1 -+ br label %bb4.us4 -+ -+bb4.us.us: ; preds = %bb2.split.us.us, %bb6.us.us -+ %i.4.01.us.us = phi i16 [ %_tmp49.us.us, %bb6.us.us ] -+ br label %bb1.i.us.us -+ -+bb1.i.us.us: ; preds = %bb4.us.us -+ br label %g.exit4.us.us -+ -+g.exit4.us.us: ; preds = %bb1.i.us.us, %g.exit4.critedge.us.us -+ %i.4.02.us.us = phi i16 [ %i.4.01.us.us, %bb1.i.us.us ] -+ br label %bb5.us.us -+ -+bb5.us.us: ; preds = %g.exit4.us.us -+ br label %bb6.us.us -+ -+bb6.us.us: ; preds = %bb5.us.us, %g.exit4.us.us -+ %i.4.03.us.us = phi i16 [ %i.4.02.us.us, %bb5.us.us ] -+ %_tmp49.us.us = add nuw nsw i16 %i.4.03.us.us, 1 -+ br label %bb4.us.us -+ -+ -+.split: ; preds = %..split_crit_edge -+ br label %bb2 -+ -+bb2: ; preds = %.split, %bb7 -+ %h.3.0 = phi i16 [ undef, %.split ], [ %_tmp53, %bb7 ] -+ br label %bb2.bb2.split_crit_edge -+ -+bb2.bb2.split_crit_edge: ; preds = %bb2 -+ br label %bb2.split -+ -+bb2.split.us: ; preds = %bb2 -+ br label %bb4.us -+ -+bb4.us: ; preds = %bb6.us, %bb2.split.us -+ %i.4.01.us = phi i16 [ 0, %bb2.split.us ] -+ br label %bb1.i.us -+ -+g.exit4.critedge.us: ; preds = %bb4.us -+ br label %g.exit4.us -+ -+bb1.i.us: ; preds = %bb4.us -+ br label %g.exit4.us -+ -+g.exit4.us: ; preds = %bb1.i.us, %g.exit4.critedge.us -+ %i.4.02.us = phi i16 [ %i.4.01.us, %g.exit4.critedge.us ], [ %i.4.01.us, %bb1.i.us ] -+ br label %bb5.us -+ -+bb5.us: ; preds = %g.exit4.us -+ br label %bb7 -+ -+bb2.split: ; preds = %bb2.bb2.split_crit_edge -+ br label %bb4 -+ -+bb4: ; preds = %bb2.split, %bb6 -+ %i.4.01 = phi i16 [ 0, %bb2.split ] -+ %_tmp16 = getelementptr [1 x [1 x %rec9]], [1 x [1 x %rec9]]* @a, i16 0, i16 %h.3.0, i16 %i.4.01, i32 0 -+ %_tmp17 = load i16, i16* %_tmp16, align 1 -+ br label %g.exit4.critedge -+ -+bb1.i: ; preds = %bb4 -+ br label %g.exit4 -+ -+g.exit4.critedge: ; preds = %bb4 -+ %_tmp28.c = getelementptr [1 x [1 x %rec9]], [1 x [1 x %rec9]]* @a, i16 0, i16 %h.3.0, i16 %i.4.01, i32 1 -+ %_tmp29.c = load i32, i32* %_tmp28.c, align 1 -+ %_tmp30.c = trunc i32 %_tmp29.c to i16 -+ br label %g.exit4 -+ -+g.exit4: ; preds = %g.exit4.critedge, %bb1.i -+ %i.4.02 = phi i16 [ %i.4.01, %g.exit4.critedge ], [ %i.4.01, %bb1.i ] -+ %_tmp41 = getelementptr [1 x [1 x %rec9]], [1 x [1 x %rec9]]* @a, i16 0, i16 %h.3.0, i16 %i.4.02, i32 2 -+ br label %bb6 -+ -+bb5: ; preds = %g.exit4 -+ br label %bb6 -+ -+bb6: ; preds = %bb5, %g.exit4 -+ %i.4.03 = phi i16 [ %i.4.02, %bb5 ], [ %i.4.02, %g.exit4 ] -+ %_tmp49 = add nuw nsw i16 %i.4.03, 1 -+ br label %bb7 -+ -+bb7: ; preds = %bb7.us-lcssa.us, %bb7.us-lcssa -+ %_tmp53 = add nsw i16 %h.3.0, 1 -+ br label %bb2 -+} --- -2.24.0 - diff --git a/projects/rust/build b/projects/rust/build index 8b45e3f..a8f886b 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -54,7 +54,6 @@ cd /var/tmp/build/rustc-[% c('version') %]-src # LLVM has reproducibility issues when optimizing bitcode, which we need to # patch. See: #32053 for more details. cd src/llvm-project -patch -p1 < $rootdir/42574.patch patch -p1 < $rootdir/43909.patch cd ../../ diff --git a/projects/rust/config b/projects/rust/config index 13aad3e..3ffcd58 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -5,8 +5,8 @@ version: '[% c("input_file_var/rust_version") %]' # those values can be changed from the input_files section of other # projects. See projects/lucetc/config and bug 32436. input_file_var: - rust_version: 1.34.2 - prev_version: 1.33.0 + rust_version: 1.41.1 + prev_version: 1.40.0 var: prev_version: '[% c("input_file_var/prev_version") %]' @@ -112,5 +112,4 @@ input_files: gpg_keyring: rust.gpg - filename: unwind.patch enable: '[% c("var/windows-i686") %]' - - filename: 42574.patch - filename: 43909.patch

1 0

[tor-browser-build/master] Bug 34388: Update lucetc and wasi-sdk projects to latest ESR 78 code
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 7c462d7a3ba54e10f3df39f577072c4ac3f53a5c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 9 08:39:04 2020 +0000 Bug 34388: Update lucetc and wasi-sdk projects to latest ESR 78 code We "re-use" the same vendored tarball filename for now as lucetc has not been used previously anyway. --- projects/fenix-rust/config | 4 ++-- projects/lucetc/build | 4 +++- projects/lucetc/config | 8 ++------ projects/rust/config | 4 ++-- projects/wasi-sysroot/build | 2 ++ projects/wasi-sysroot/config | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/fenix-rust/config b/projects/fenix-rust/config index 9ad9908..df0ba86 100644 --- a/projects/fenix-rust/config +++ b/projects/fenix-rust/config @@ -2,8 +2,8 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: '[% c("input_file_var/rust_version") %]' -# those values can be changed from the input_files section of other -# projects. See projects/lucetc/config and bug 32436. +# Those values can be changed from the input_files section of other +# projects. See bug 32436. input_file_var: rust_version: 1.43.0 prev_version: 1.42.0 diff --git a/projects/lucetc/build b/projects/lucetc/build index 0157cc9..3f835bd 100644 --- a/projects/lucetc/build +++ b/projects/lucetc/build @@ -13,11 +13,12 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %] export PATH="/var/tmp/dist/cmake/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:/var/tmp/dist/rust/bin:$PATH" export CC=$distdir/clang/bin/clang export CFLAGS="-L$distdir/clang/lib" -export CXXFLAGS=$CFLAGS export CXX=$distdir/clang/bin/clang++ +export CXXFLAGS=$CFLAGS export AR=$distdir/clang/bin/llvm-ar export RUSTFLAGS="-C linker=$CXX -C link-arg=$CXXFLAGS" export LUCET_PREFIX=$distdir/[% project %] +# XXX: Why do we need that when Mozilla doesn't? See: taskcluster/scripts/misc/build-lucetc.sh export WASI_SYSROOT=$distdir/wasi-sysroot mkdir -p /var/tmp/build @@ -39,6 +40,7 @@ directory = "/var/tmp/build/lucetc/vendor" EOF make -j[% c("buildconf/num_procs") %] build +# XXX: Should not be needed, just the lucetc binary, see: taskcluster/scripts/misc/build-lucetc.sh make install cd $distdir diff --git a/projects/lucetc/config b/projects/lucetc/config index 647d83f..f60629e 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") %]' version: '[% c("abbrev") %]' -git_hash: 5c22392b5b1aaa60e915c75e92b57391e1e61e6d +git_hash: a0a1ce981638109f1f76cd1eecf17a0436a20055 git_url: https://github.com/PLSysSec/lucet_sandbox_compiler/ git_submodule: 1 @@ -23,13 +23,9 @@ input_files: project: binutils - name: rust project: rust - input_file_var: - # lucetc needs Rust >= 1.36.0 - rust_version: 1.36.0 - prev_version: 1.35.0 - name: wasi-sysroot project: wasi-sysroot # `cargo vendor vendor` in the `lucetc-sandbox-compiler` directory has vendored # the sources. - URL: https://people.torproject.org/~gk/mirrors/sources/lucetc-vendor.tar.bz2 - sha256sum: 5a7802834d0d4b9210f323cf69cc305946f22dba4ddaf2c4c0eb6d3621da2c2a + sha256sum: 12ba97fca12177e7ed5b5409fcfdbd31dc7db2e82282768d99dee5bcb1b1246a diff --git a/projects/rust/config b/projects/rust/config index 3ffcd58..4144b17 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -2,8 +2,8 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: '[% c("input_file_var/rust_version") %]' -# those values can be changed from the input_files section of other -# projects. See projects/lucetc/config and bug 32436. +# Those values can be changed from the input_files section of other +# projects. See bug 32436. input_file_var: rust_version: 1.41.1 prev_version: 1.40.0 diff --git a/projects/wasi-sysroot/build b/projects/wasi-sysroot/build index 5ea885c..6cdcf2f 100644 --- a/projects/wasi-sysroot/build +++ b/projects/wasi-sysroot/build @@ -23,6 +23,8 @@ cd $builddir # hard-code the version for now. patch -p1 < $rootdir/no-git.patch +# 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 %] cd $distdir diff --git a/projects/wasi-sysroot/config b/projects/wasi-sysroot/config index 512769b..8b3ae15 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") %]' version: '[% c("abbrev") %]' -git_hash: 87b7a019472770f08d49cf3b558867dc76ea74eb +git_hash: 5225b05436ce57f01fe649f411f3ff701246628b git_url: https://github.com/CraneStation/wasi-sdk git_submodule: 1

1 0

[tor-browser-build/master] Bug 34391: Remove unused --enable-signmar option
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 83772c1776809b853e686773c18ccb76a7edfd49 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 14 21:42:28 2020 +0000 Bug 34391: Remove unused --enable-signmar option The --enable-signmar option is gone with https://bugzilla.mozilla.org/show_bug.cgi?id=1562952. The signmar tool is always built now. --- projects/firefox/mozconfig-linux-i686 | 3 +-- projects/firefox/mozconfig-linux-x86_64 | 1 - projects/firefox/mozconfig-osx-x86_64 | 3 +-- projects/firefox/mozconfig-windows-i686 | 1 - projects/firefox/mozconfig-windows-x86_64 | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index 87b64d7..3ea241f 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -23,7 +23,6 @@ ac_add_options --enable-official-branding ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-tor-browser-update -ac_add_options --enable-signmar ac_add_options --enable-verify-mar ac_add_options --disable-tests @@ -38,4 +37,4 @@ ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-debug-symbols # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 59517cd..e4d2b99 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -21,7 +21,6 @@ ac_add_options --enable-official-branding ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-tor-browser-update -ac_add_options --enable-signmar ac_add_options --enable-verify-mar ac_add_options --disable-strip diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 8fa7885..8f088a5 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -37,7 +37,6 @@ ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir ac_add_options --enable-tor-browser-update -ac_add_options --enable-signmar ac_add_options --enable-verify-mar ac_add_options --disable-crashreporter @@ -48,4 +47,4 @@ ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 4fd9958..8cb2850 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -27,7 +27,6 @@ ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update -ac_add_options --enable-signmar ac_add_options --enable-verify-mar ac_add_options --disable-bits-download diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index ae5cf67..d35dc18 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -27,7 +27,6 @@ ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update -ac_add_options --enable-signmar ac_add_options --enable-verify-mar ac_add_options --disable-bits-download

1 0

[tor-browser-build/master] Bug 34390: Don't copy DBM libraries anymore
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 4f130777523edbe01f2f072910be97bea73ded12 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 14 21:44:27 2020 +0000 Bug 34390: Don't copy DBM libraries anymore DBM is not built by default anymore since https://bugzilla.mozilla.org/show_bug.cgi?id=1594933 landed. --- projects/firefox/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 16984f3..9461034 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -199,10 +199,10 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/dist/bin/pk12util $MARTOOLS/ cp -p obj-*/dist/bin/shlibsign $MARTOOLS/ [% IF c("var/linux") %] - NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" [% ELSE %] - NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libsoftokn3.dylib" + NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libsoftokn3.dylib" # No NSPR_LIBS for macOS NSPR_LIBS="" [% END %] @@ -216,7 +216,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/dist/bin/modutil.exe $MARTOOLS/ cp -p obj-*/dist/bin/pk12util.exe $MARTOOLS/ cp -p obj-*/dist/bin/shlibsign.exe $MARTOOLS/ - NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssckbi.dll nssdbm3.dll softokn3.dll" + NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssckbi.dll softokn3.dll" for LIB in $NSS_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done

1 0

[tor-browser-build/master] Bug 32389: Enable WASM sandbox for Linux builds
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit b7d40046c0609e77cd9eb088f5e05775edd1c4a2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 19:56:35 2020 +0000 Bug 32389: Enable WASM sandbox for Linux builds --- projects/firefox/build | 14 ++++++++++++++ projects/firefox/config | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 9461034..294e35a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -39,6 +39,20 @@ export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" [% END -%] [% END -%] +[% IF c("var/rlbox") -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %] + # XXX: We need the libclang_rt.builtins-wasm32.a in our clang lib directory. + # Copy it over. + # https://searchfox.org/mozilla-central/source/build/build-clang/build-clang.…, + # include it directly in our clang + mkdir /var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi + cp /var/tmp/dist/wasi-sysroot/lib/clang/9.0.0/lib/wasi/libclang_rt.builtins-wasm32.a /var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi + 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 + export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/share/wasi-sysroot +[% END -%] + tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] diff --git a/projects/firefox/config b/projects/firefox/config index 7c700a8..0ecce9d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -135,6 +135,12 @@ input_files: name: rust - project: cbindgen name: cbindgen + - project: wasi-sysroot + name: wasi-sysroot + enable: '[% c("var/rlbox") %]' + - project: lucetc + name: lucetc + enable: '[% c("var/rlbox") %]' - project: node name: node - project: nasm

1 0

[tor-browser-build/master] Bug 40005: Adapt Node project for Firefox 78 ESR
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 3410482e8620a030c2c8a998555b7b4b92118d76 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 14 11:15:00 2020 +0000 Bug 40005: Adapt Node project for Firefox 78 ESR We remove our fenix-node project, too, as there is no difference between it and the node project anymore. It seems both ESR and non-ESR are using the same version for the time being. --- projects/fenix-node/build | 24 ------------------------ projects/fenix-node/config | 18 ------------------ projects/geckoview/build | 2 +- projects/geckoview/config | 6 +++--- projects/node/build | 4 ++-- projects/node/config | 5 +++-- 6 files changed, 9 insertions(+), 50 deletions(-) diff --git a/projects/fenix-node/build b/projects/fenix-node/build deleted file mode 100644 index 8cc8ea5..0000000 --- a/projects/fenix-node/build +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% 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 - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - export PATH="/var/tmp/dist/binutils/bin:$PATH" -[% END -%] -distdir=/var/tmp/dist/[% project %] -tar -xf [% c('input_files_by_name/node') %] -cd node-[% c('version') %] - -./configure --prefix=$distdir -make -j[% c("buildconf/num_procs") %] -make install - -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/fenix-node/config b/projects/fenix-node/config deleted file mode 100644 index b3534f4..0000000 --- a/projects/fenix-node/config +++ /dev/null @@ -1,18 +0,0 @@ -# vim: filetype=yaml sw=2 -version: v10.21.0 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 - -input_files: - - project: container-image - - project: binutils - name: binutils - enable: '[% c("var/linux") %]' - - project: '[% c("var/compiler") %]' - name: '[% c("var/compiler") %]' - enable: '[% c("var/linux") %]' - - URL: 'https://nodejs.org/download/release/[% c("version") %]/node-[% c("version") %].tar.xz' - sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b - name: node diff --git a/projects/geckoview/build b/projects/geckoview/build index b12c096..9eee8c4 100644 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -20,7 +20,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/fenix-rust/bin:/var/tmp/dist/fenix-cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/fenix-node/bin:/var/tmp/dist/fenix-clang/bin:/var/tmp/dist/binutils/bin:$PATH" +export PATH="/var/tmp/dist/fenix-rust/bin:/var/tmp/dist/fenix-cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:/var/tmp/dist/fenix-clang/bin:/var/tmp/dist/binutils/bin:$PATH" tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/geckoview/config b/projects/geckoview/config index e82139a..c046660 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -47,7 +47,7 @@ steps: tar -C $distdir -xf [% c('input_files_by_name/node') %] tar -C $distdir -xf [% c('input_files_by_name/python') %] - export PATH="/var/tmp/dist/fenix-node/bin:/var/tmp/dist/python/bin:$PATH" + export PATH="/var/tmp/dist/node/bin:/var/tmp/dist/python/bin:$PATH" tar -C $builddir -xf [% c('input_files_by_name/geckoview_armv7') %] tar -C $builddir -xf [% c('input_files_by_name/geckoview_aarch64') %] @@ -97,7 +97,7 @@ steps: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' pkg_type: build - - project: fenix-node + - project: node name: node pkg_type: build - project: python @@ -147,7 +147,7 @@ input_files: name: rust - project: fenix-cbindgen name: cbindgen - - project: fenix-node + - project: node name: node - project: nasm name: nasm diff --git a/projects/node/build b/projects/node/build index 0e6ca04..8cc8ea5 100644 --- a/projects/node/build +++ b/projects/node/build @@ -10,8 +10,8 @@ export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] distdir=/var/tmp/dist/[% project %] -tar -xf [% project %]-[% c('version') %].tar.xz -cd [% project %]-[% c('version') %] +tar -xf [% c('input_files_by_name/node') %] +cd node-[% c('version') %] ./configure --prefix=$distdir make -j[% c("buildconf/num_procs") %] diff --git a/projects/node/config b/projects/node/config index e023380..b3534f4 100644 --- a/projects/node/config +++ b/projects/node/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: v10.16.0 +version: v10.21.0 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -14,4 +14,5 @@ input_files: name: '[% c("var/compiler") %]' enable: '[% c("var/linux") %]' - URL: 'https://nodejs.org/download/release/[% c("version") %]/node-[% c("version") %].tar.xz' - sha256sum: 18e37f891d10ea7fbc8f6410c444c2b1d9cc3cbbb1d35aa9c41f761816956608 + sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b + name: node

1 0

[tor-browser-build/master] Bug 40018: Add libtapi project for cctools
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 58d6189af6914b00264bf556ef61b8c53ff5f2f1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 9 15:09:07 2020 +0000 Bug 40018: Add libtapi project for cctools --- projects/libtapi/build | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ projects/libtapi/config | 20 ++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/projects/libtapi/build b/projects/libtapi/build new file mode 100644 index 0000000..a0d9c3e --- /dev/null +++ b/projects/libtapi/build @@ -0,0 +1,48 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +builddir=/var/tmp/build/[% project %]-[% c('version') %] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] + +# We don't export the path to clang here to follow Mozilla's build script at +# taskcluster/scripts/misc/build-cctools-port.sh more closely. +export PATH="/var/tmp/dist/cmake/bin:/var/tmp/dist/ninja:$PATH" +export CLANG_DIR=/var/tmp/dist/clang +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +export CC=$CLANG_DIR/bin/clang +export CXX=$CLANG_DIR/bin/clang++ +# We also need this LD_LIBRARY_PATH at build time, since tapi builds bits of +# clang build tools, and then executes those tools. +export LD_LIBRARY_PATH=$CLANG_DIR/lib + +cd $builddir +mkdir build +cd build +# Values taken from build.sh +TAPI_REPOSITORY=tapi-1000.10.8 +TAPI_VERSION=10.0.0 + +INCLUDE_FIX="-I $builddir/src/llvm/projects/clang/include -I $PWD/projects/clang/include" + +cmake $builddir/src/llvm \ + -GNinja \ + -DCMAKE_CXX_FLAGS="$INCLUDE_FIX" \ + -DLLVM_INCLUDE_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=RELEASE \ + -DCMAKE_INSTALL_PREFIX=$distdir \ + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ + -DTAPI_REPOSITORY_STRING=$TAPI_REPOSITORY \ + -DTAPI_FULL_VERSION=$TAPI_VERSION + +ninja clangBasic +ninja libtapi install-libtapi install-tapi-headers + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/libtapi/config b/projects/libtapi/config new file mode 100644 index 0000000..6c4f5d0 --- /dev/null +++ b/projects/libtapi/config @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: '[% c("abbrev") %]' +# This can be found in +# taskcluster/ci/fetch/toolchains.yml +git_hash: 3efb201881e7a76a21e0554906cf306432539cef +git_url: https://github.com/tpoechtrager/apple-libtapi + +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: clang + project: clang + - name: cmake + project: cmake + - name: ninja + project: ninja

1 0

[tor-browser-build/master] Bug 34230: Update Windows toolchain for Firefox 78 ESR
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit e26758540bb98e8dc3f9b94e06acd0b75f1a4aa8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 30 07:09:10 2020 +0000 Bug 34230: Update Windows toolchain for Firefox 78 ESR The sort patch is not needed anymore as the reproducibility issue got fixed with commit 1405ac457b8b583215cf92d73fbe4479f7c86029 in libcxx. --enable-strip is gone for Windows, see: https://hg.mozilla.org/mozilla-central/rev/943fe6210744. We rebase the libunwind related patch for 32bit Windows for compatibility with Rust 1.41.1, too. --- projects/firefox/mozconfig-windows-i686 | 1 - projects/firefox/mozconfig-windows-x86_64 | 1 - projects/firefox/nsis-uninstall.patch | 18 +++---- projects/llvm-mingw/config | 2 +- projects/mingw-w64-clang/build | 1 - projects/mingw-w64-clang/config | 5 +- projects/mingw-w64-clang/sort.patch | 22 -------- projects/mingw-w64/config | 6 +-- projects/rust/unwind.patch | 85 ++++++++++++++++--------------- 9 files changed, 56 insertions(+), 85 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 8cb2850..a2364e9 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -23,7 +23,6 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize -ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index d35dc18..188b3c5 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -23,7 +23,6 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize -ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update diff --git a/projects/firefox/nsis-uninstall.patch b/projects/firefox/nsis-uninstall.patch index 60e4e3d..93d56aa 100644 --- a/projects/firefox/nsis-uninstall.patch +++ b/projects/firefox/nsis-uninstall.patch @@ -1,13 +1,9 @@ -From e338a77c64c0afb72e857c7daa63346d35ad3891 Mon Sep 17 00:00:00 2001 +From 67c1d7d66d99494102832e12059a84fa439c88e0 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 12 Jun 2018 21:58:24 -0400 -Subject: [PATCH 1/1] Bug 26205: Don't build the uninstaller for Windows during +Subject: [PATCH] Bug 26205: Don't build the uninstaller for Windows during Firefox compilation ---- - browser/Makefile.in | 4 ---- - browser/installer/Makefile.in | 4 ---- - 2 files changed, 8 deletions(-) diff --git a/browser/Makefile.in b/browser/Makefile.in index 2eb9e708f68e..0c9442183942 100644 @@ -25,7 +21,7 @@ index 2eb9e708f68e..0c9442183942 100644 $(MAKE) -C installer/windows maintenanceservice_installer endif diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in -index 1bf11252ee06..dee6d5434106 100644 +index 0325f0ffab9a..a5a9488623a3 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -98,10 +98,6 @@ ifdef NECKO_WIFI @@ -36,9 +32,9 @@ index 1bf11252ee06..dee6d5434106 100644 -DEFINES += -DHAVE_MAKENSISU=1 -endif - - ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore - MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png + ifdef MOZ_DEFAULT_BROWSER_AGENT + DEFINES += -DMOZ_DEFAULT_BROWSER_AGENT=1 + endif -- -2.18.0.rc2 +2.27.0 diff --git a/projects/llvm-mingw/config b/projects/llvm-mingw/config index b1ebf42..eaaed6e 100644 --- a/projects/llvm-mingw/config +++ b/projects/llvm-mingw/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_hash: c3a16814bd26aa6702e1e5b482a3d9044bb0f725 +git_hash: 9f8e5cebd6dbbb7546e8917e6c59284699a48d26 git_url: https://github.com/mstorsjo/llvm-mingw.git filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 302975d..ecb0e2c 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -172,7 +172,6 @@ make -j[% c("buildconf/num_procs") %] VERBOSE=1 # libcxx cd $builddir/libcxx -patch -p1 < $rootdir/sort.patch mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 11480b9..9ae0e61 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 0a1d495478d8ed1a94fc77b9dbb428b7e0372588 +git_hash: 1b373beec6d07478ffba33726bb3bb21f32e4411 version: '[% c("abbrev") %]' -llvm_version: 8.0.1 +llvm_version: 9.0.1 gpg_keyring: clang.gpg sig_ext: sig @@ -36,4 +36,3 @@ input_files: - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch - - filename: sort.patch diff --git a/projects/mingw-w64-clang/sort.patch b/projects/mingw-w64-clang/sort.patch deleted file mode 100644 index e9143b0..0000000 --- a/projects/mingw-w64-clang/sort.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9eeb3b9ea13b25591c9081a5f05a1904d367d523 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Wed, 11 Sep 2019 13:25:54 +0000 -Subject: [PATCH] sorted - - -diff --git a/utils/merge_archives.py b/utils/merge_archives.py -index 58d92f0e2..597ca2471 100755 ---- a/utils/merge_archives.py -+++ b/utils/merge_archives.py -@@ -124,7 +124,7 @@ def main(): - execute_command_verbose([ar_exe, 'x', arc], cwd=temp_directory_root, - verbose=args.verbose) - -- files = glob.glob(os.path.join(temp_directory_root, '*.o*')) -+ files = sorted(glob.glob(os.path.join(temp_directory_root, '*.o*'))) - if not files: - print_and_exit('Failed to glob for %s' % temp_directory_root) - cmd = [ar_exe, 'qcs', args.output] + files --- -2.23.0 - diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 1ccbcdf..b0ace13 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,12 +1,12 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 0a1d495478d8ed1a94fc77b9dbb428b7e0372588 +git_hash: 1b373beec6d07478ffba33726bb3bb21f32e4411 version: '[% c("abbrev") %]' var: container: use_container: 1 - gcc_version: 9.2.0 + gcc_version: 9.3.0 deps: - automake - build-essential @@ -30,6 +30,6 @@ targets: input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.xz' - sha256sum: ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + sha256sum: 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 - name: binutils project: binutils diff --git a/projects/rust/unwind.patch b/projects/rust/unwind.patch index 7b22dcb..c25d9d2 100644 --- a/projects/rust/unwind.patch +++ b/projects/rust/unwind.patch @@ -1,4 +1,4 @@ -From b3bea7008ece7a5bdf9b5a5dcc95e82febad1854 Mon Sep 17 00:00:00 2001 +From 212ea02a0743a3bd4fcab1288682d3d780da960b 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 @@ -32,61 +32,58 @@ 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 249a183189..df08d6eb0c 100644 +index 831053bc0f7..13ec5da3e3d 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs -@@ -162,7 +162,12 @@ pub fn std_cargo(builder: &Builder<'_>, - .arg("--features") - .arg("compiler-builtins-mem"); - } else { -- let features = builder.std_features(); -+ let mut features = builder.std_features(); -+ +@@ -208,6 +208,11 @@ pub fn std_cargo(builder: &Builder<'_>, + 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"); + } - ++ if compiler.stage != 0 && builder.config.sanitizers { // This variable is used by the sanitizer runtime crates, e.g. + // rustc_lsan, to build the sanitizer runtime from C code diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml -index 7d60a17042..d876d0b89a 100644 +index a22e162bbff..e1c8f164916 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml -@@ -71,3 +71,4 @@ wasm-bindgen-threads = [] - # https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/… +@@ -78,6 +78,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 2378b0a315..0b5979ed62 100644 +index 77bcfffd506..9d9fc5fbff5 100644 --- a/src/libunwind/Cargo.toml +++ b/src/libunwind/Cargo.toml -@@ -16,3 +16,6 @@ doc = false - core = { path = "../libcore" } - libc = { version = "0.2.43", features = ['rustc-dep-of-std'], default-features = false } - compiler_builtins = "0.1.0" -+ -+[features] +@@ -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 339b554ed6..ec2f93ed60 100644 +index 0b39503c0d0..ec8681c2985 100644 --- a/src/libunwind/libunwind.rs +++ b/src/libunwind/libunwind.rs -@@ -1,10 +1,5 @@ - #![allow(nonstandard_style)] - --macro_rules! cfg_if { -- ( $( if #[cfg( $meta:meta )] { $($it1:item)* } else { $($it2:item)* } )* ) => -- ( $( $( #[cfg($meta)] $it1)* $( #[cfg(not($meta))] $it2)* )* ) --} -- - use libc::{c_int, c_void, uintptr_t}; - - #[repr(C)] -@@ -73,8 +68,8 @@ pub enum _Unwind_Context {} - pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code, - exception: *mut _Unwind_Exception); +@@ -74,8 +74,8 @@ pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reaso + any(target_os = "fuchsia", target_os = "linux")), + link(name = "unwind", kind = "static"))] extern "C" { - #[unwind(allowed)] - pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; @@ -95,15 +92,15 @@ index 339b554ed6..ec2f93ed60 100644 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; -@@ -206,26 +201,52 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm - pc - } - } -+} // cfg_if! +@@ -216,32 +216,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_if! { +- #[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" { @@ -132,6 +129,9 @@ index 339b554ed6..ec2f93ed60 100644 } -} 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; @@ -157,6 +157,7 @@ index 339b554ed6..ec2f93ed60 100644 + } } } // cfg_if! + -- -2.23.0.rc0 +2.27.0

1 0