July 2020 - tor-commits - lists.torproject.org

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 17 Jul '20

17 Jul '20

commit f3753c131a3abad93675ab2ea6c2cb405c17c3e8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 17 05:17:51 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ka.po | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 28badeb70a..5e31c97a17 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -8940,8 +8940,8 @@ msgid "" "So, are these distinct users per day, average number of users connected over" " the day, or what?" msgstr "" -"ანუ ესაა უნიკალური რაოდენობა ყოველდღიურად, საშუალო რაოდენობა დაკავშირებული " -"მომხმარებლების დღეში, თუ რა?" +"გამოდის, ესაა უნიკალური მომხმარებლები ყოველდღიურად, საშუალო რაოდენობა, " +"რომლებიც მიერთებულნი არიან დღის განმავლობაში, თუ რა?" #: https//support.torproject.org/metrics/concurrent-users/ #: (content/metrics/concurrent-users/contents+en.lrquestion.description) @@ -11735,7 +11735,7 @@ msgid "" "Internet." msgstr "" "სინამდვილეში კი ასე არაა — ტროლების უმეტესობა ჩვეულებრივ იყენებს მილიონობით " -"პროქსის ან გატეხილ კომპიუტერებს, მთელ ინტერნეტში." +"პროქსის ან გატეხილ კომპიუტერს, მთელ ინტერნეტში." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11745,8 +11745,8 @@ msgid "" "sprung up based on this flawed security model (not unlike the antivirus " "industry)." msgstr "" -"IRC-ქსელები წაგებულ ომში არიან ჩართული, ყველა კვანძის შეზღუდვის მცდელობით და" -" სახელსახელოდ შექმნილი ტროლების საწინააღმდეგო აკრძალვების სიებით, " +"IRC-ქსელები წაგებულ ომშია ჩართული, ყველა კვანძის შეზღუდვის მცდელობით და " +"სახელსახელოდ შექმნილი ტროლების საწინააღმდეგო აკრძალვების სიებით, " "ნაკლოვანების მქონე უსაფრთხოების მოდელის გამო (მსგავსად ანტივირუსების " "სფეროსი)." @@ -11779,8 +11779,8 @@ msgid "" "And most individual IP addresses do equate to individual humans, on any " "given IRC network at any given time." msgstr "" -"და ცალკეული IP-მისამართების უმეტესობა, შეესაბამება ცალკეულ პიროვნებებს, " -"მოცემულ IRC-ქსელში, მოცემული დროისთვის." +"თან, უმეტესად ცალკეული IP-მისამართი, მართლაც შეესაბამება ცალკეულ პიროვნებას," +" მოცემულ IRC-ქსელში, მოცემული დროისთვის." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11800,7 +11800,7 @@ msgid "" msgstr "" "მიუხედავად იმისა, რომ ესაა წაგებული ბრძოლა ღია პროქსების წინააღმდეგ, ზოგადად" " არაა წაგებული ცალკეული მავნებელი IRC-მომხმარებლებთან მიმართებით, ვინაიდან " -"ასეთი მომხმარებელს ადრე თუ გვიან მობეზრდება და მიატოვებს არხს." +"ასეთ მომხმარებელს ადრე თუ გვიან მობეზრდება და მიატოვებს არხს." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11817,7 +11817,7 @@ msgid "" "This needs to be based on some property of the human (such as a password " "they know), not some property of the way their packets are transported." msgstr "" -"ეს უნდა ეფუძნებოდეს იმ საშუალებებს, რაც გააჩნია ადამიანს (მაგალითად " +"ეს უნდა ეფუძნებოდეს იმ საშუალებებს, რომლებიც გააჩნია ადამიანს (მაგალითად " "დამახსოვრებული პაროლი) და არა იმ გზებს, რომლითაც მათი მონაცემები გადაიცემა." #: https//support.torproject.org/abuse/tor-ban-irc/ @@ -11880,8 +11880,8 @@ msgid "" "Maybe inviting them to #tor on irc.oftc.net will help show them that we are " "not all evil people." msgstr "" -"შესაძლოა მოიწვიოთ კიდეც #tor არხზე irc.oftc.net რაც დაანახებთ მათ, რომ არ " -"ვართ ცუდი ხალხი." +"შეგიძლიათ მოიწვიოთ კიდეც #tor არხში irc.oftc.net მისამართზე, რაც დაარწმუნებს" +" მათ, რომ არ ვართ ცუდი ხალხი." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11953,6 +11953,12 @@ msgid "" " are evil — they attempt to strong-arm network administrators on policy, " "service, and routing issues, and then extract ransoms from victims." msgstr "" +"მიუხედავად იმისა, რომ [Tor გამოუსადეგარია მავნე წერილების](/abuse/what-" +"about-spammers/) გასაგზავნად, შეზღუდვის სიების ზოგი თავგამოდებული შემდგენი " +"მიიჩნევს, რომ ისეთი ღია ქსელები, როგორიცაა Tor, ბოროტების წყაროა — " +"თავდასხმის საფრთხეს წარმოადგენს ქსელის ზედამხედველებისთვის, ხელყოფს მათ " +"გამართულ დებულებებს, მომსახურებასა და გადამისამართების სქემებს, შემდეგ კი " +"გამოსასყიდს ითხოვს მსხვერპლისგან." #: https//support.torproject.org/abuse/nodes-banned-from-mail-server/ #: (content/abuse/mail-server-ban/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 17 Jul '20

17 Jul '20

commit 5b192a6c99ceed8df0cd400e28f92b23cf89884a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 17 04:47:55 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ka.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index 3624daf5f0..28badeb70a 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -11961,6 +11961,9 @@ msgid "" "refuse incoming mail, you should have a conversation with them and explain " "about Tor and Tor's exit policies." msgstr "" +"თუ თქვენი ქსელის ზედამხედველები გადაწყვეტენ ამგვარი სიების გამოყენებას, " +"შემომავალი წერილების შესაზღუდად, კარგი იქნება თუ დაელაპარაკებით და აუხსნით, " +"რა არის Tor და მისი გამსვლელი დებულებები." #: https//support.torproject.org/abuse/remove-content-from-onion-address/ #: (content/abuse/remove-content/contents+en.lrquestion.title) @@ -12047,11 +12050,15 @@ msgid "" "as a national coordination point for investigation of child pornography: " "http://www.missingkids.com/." msgstr "" +"თუ გაქვთ ბავშვებზე ძალადობის ამსახველი მასალები, შეგიძლიათ მოახსენოთ " +"დაკარგულ და იძულებით საქმიანობაში ჩართულ ბავშვთა ეროვნულ ცენტრს, რომელიც " +"აერთიანებს ეროვნულ ძალისხმევას, მიმართულს ბავშვთა პორნოგრაფიასთან " +"დაკავშირებული საკითხების გამოძიებაზე: http://www.missingkids.com/." #: https//support.torproject.org/abuse/remove-content-from-onion-address/ #: (content/abuse/remove-content/contents+en.lrquestion.description) msgid "We do not view links you report." -msgstr "" +msgstr "ჩვენ არ ვნახულობთ თქვენ მიერ მოხსენებულ ბმულების." #: https//support.torproject.org/abuse/respond-to-isp-about-exit-relay/ #: (content/abuse/respond-isp/contents+en.lrquestion.title)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 17 Jul '20

17 Jul '20

commit 99776a81e08a53521f7939c5a9a7efc490d0e20d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 17 04:17:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ka.po | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index c656a03ae6..3624daf5f0 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -11788,6 +11788,8 @@ msgid "" "The exceptions include NAT gateways which may be allocated access as special" " cases." msgstr "" +"გამონაკლისია NAT-გამსვლელები, რომლებიც შესაძლოა განისაზღვროს წვდომისთვის " +"განსაკუთრებულ შემთხვევებში." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11796,6 +11798,9 @@ msgid "" "generally a losing battle to keep klining a single ill-behaved IRC user " "until that user gets bored and goes away." msgstr "" +"მიუხედავად იმისა, რომ ესაა წაგებული ბრძოლა ღია პროქსების წინააღმდეგ, ზოგადად" +" არაა წაგებული ცალკეული მავნებელი IRC-მომხმარებლებთან მიმართებით, ვინაიდან " +"ასეთი მომხმარებელს ადრე თუ გვიან მობეზრდება და მიატოვებს არხს." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11803,6 +11808,8 @@ msgid "" "But the real answer is to implement application-level auth systems, to let " "in well-behaving users and keep out badly-behaving users." msgstr "" +"მაგრამ ქმედითი პასუხი მაინც იქნება პროგრამულ დონეზე დამოწმების სისტემები, " +"რომლითაც კარგი მომხმარებლები დაიშვებიან, ხოლო ცუდები არა." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11810,6 +11817,8 @@ msgid "" "This needs to be based on some property of the human (such as a password " "they know), not some property of the way their packets are transported." msgstr "" +"ეს უნდა ეფუძნებოდეს იმ საშუალებებს, რაც გააჩნია ადამიანს (მაგალითად " +"დამახსოვრებული პაროლი) და არა იმ გზებს, რომლითაც მათი მონაცემები გადაიცემა." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11862,6 +11871,8 @@ msgid "" "you may want to consider moving to a network that is more open to free " "speech." msgstr "" +"თუ კარგად აუხსნით საკითხს და ისინი მაინც Tor-ის შეზღუდვაზე შეჯერდებიან, " +"ალბათ აჯობებს სხვა ქსელში გადახვიდეთ, სადაც სიტყვის მეტი თავისუფლებაა." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11869,6 +11880,8 @@ msgid "" "Maybe inviting them to #tor on irc.oftc.net will help show them that we are " "not all evil people." msgstr "" +"შესაძლოა მოიწვიოთ კიდეც #tor არხზე irc.oftc.net რაც დაანახებთ მათ, რომ არ " +"ვართ ცუდი ხალხი." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11879,6 +11892,10 @@ msgid "" "tracker](https://trac.torproject.org/projects/tor/wiki/doc/BlockingIrc) so " "that others can share." msgstr "" +"და ბოლოს, თუ გადააწყდით IRC-ქსელს, რომელიც ზღუდავს Tor-ს ან Tor-ის რომელიმე " +"გამავალ კვანძს, გთხოვთ ეს ინფორმაცია განათავსოთ [The Tor IRC block " +"tracker](https://trac.torproject.org/projects/tor/wiki/doc/BlockingIrc) " +"გვერდზე, რომ სხვებმაც გააზიარონ." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11886,6 +11903,8 @@ msgid "" "At least one IRC network consults that page to unblock exit nodes that have " "been blocked inadvertently." msgstr "" +"სულ მცირე ერთი IRC-ქსელი მაინც არის, რომელიც ითვალისწინებს ამ გვერდს, რომ " +"მოხსნას გამავალ კვანძს, შემთხვევით დადებული შეზღუდვა." #: https//support.torproject.org/abuse/legal-questions-about-tor-abuse/ #: (content/abuse/legal-questions/contents+en.lrquestion.title) @@ -11923,6 +11942,8 @@ msgstr "" #: (content/abuse/mail-server-ban/contents+en.lrquestion.title) msgid "Your nodes are banned from the mail server I want to use." msgstr "" +"თქვენი კვანძები აკრძალულია იმ საფოსტო მომსახურებაზე, რომლის გამოყენებაც " +"მსურს." #: https//support.torproject.org/abuse/nodes-banned-from-mail-server/ #: (content/abuse/mail-server-ban/contents+en.lrquestion.description) @@ -12565,7 +12586,7 @@ msgstr "გამოყენებულია თუ არა Tor." #: templates/glossary.html:26 msgid "Contributors to item page:" -msgstr "" +msgstr "გვერდის მასალაში წვლილის შემტანები:" #: templates/glossary.html:28 msgid "Edit item page"

1 0

[tor-browser-build/master] Bug 33833: Upgrade Rust to use Android NDK 20
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit f2334e1dcb1714a2838b7c61569337f4e425fad5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 11 09:57:33 2020 +0000 Bug 33833: Upgrade Rust to use Android NDK 20 Bump Rust version to 1.43.0, too, which is used by Mozilla now. We add a new project to not interfere with non-mobile toolchain requirements for now until both series are moved to the non-ESR release train. --- projects/fenix-rust/43909.patch | 252 +++++++++++++++++++++++++++++++++++++++ projects/fenix-rust/build | 80 +++++++++++++ projects/fenix-rust/config | 105 ++++++++++++++++ projects/fenix-rust/unwind.patch | 162 +++++++++++++++++++++++++ 4 files changed, 599 insertions(+) diff --git a/projects/fenix-rust/43909.patch b/projects/fenix-rust/43909.patch new file mode 100644 index 0000000..78d2a75 --- /dev/null +++ b/projects/fenix-rust/43909.patch @@ -0,0 +1,252 @@ +From c95310f2d4fd3c88241c3b5d6dbf6251d34a3256 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita.ppv(a)gmail.com> +Date: Sat, 16 Nov 2019 16:22:18 +0100 +Subject: [PATCH] Restructure caching + +Variant on D70103. The caching is switched to always use a BB to +cache entry map, which then contains per-value caches. A separate +set contains value handles with a deletion callback. This allows us +to properly invalidate overdefined values. + +A possible alternative would be to always cache by value first and +have per-BB maps/sets in the each cache entry. In that case we could +use a ValueMap and would avoid the separate value handle set. I went +with the BB indexing at the top level to make it easier to integrate +D69914, but possibly that's not the right choice. + +Differential Revision: https://reviews.llvm.org/D70376 + +diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp +index 110c085d3f3..aa6862cb588 100644 +--- a/llvm/lib/Analysis/LazyValueInfo.cpp ++++ b/llvm/lib/Analysis/LazyValueInfo.cpp +@@ -133,12 +133,9 @@ namespace { + /// A callback value handle updates the cache when values are erased. + class LazyValueInfoCache; + struct LVIValueHandle final : public CallbackVH { +- // Needs to access getValPtr(), which is protected. +- friend struct DenseMapInfo<LVIValueHandle>; +- + LazyValueInfoCache *Parent; + +- LVIValueHandle(Value *V, LazyValueInfoCache *P) ++ LVIValueHandle(Value *V, LazyValueInfoCache *P = nullptr) + : CallbackVH(V), Parent(P) { } + + void deleted() override; +@@ -152,89 +149,63 @@ namespace { + /// This is the cache kept by LazyValueInfo which + /// maintains information about queries across the clients' queries. + class LazyValueInfoCache { +- /// This is all of the cached block information for exactly one Value*. +- /// The entries are sorted by the BasicBlock* of the +- /// entries, allowing us to do a lookup with a binary search. +- /// Over-defined lattice values are recorded in OverDefinedCache to reduce +- /// memory overhead. +- struct ValueCacheEntryTy { +- ValueCacheEntryTy(Value *V, LazyValueInfoCache *P) : Handle(V, P) {} +- LVIValueHandle Handle; +- SmallDenseMap<PoisoningVH<BasicBlock>, ValueLatticeElement, 4> BlockVals; ++ /// This is all of the cached information for one basic block. It contains ++ /// the per-value lattice elements, as well as a separate set for ++ /// overdefined values to reduce memory usage. ++ struct BlockCacheEntryTy { ++ SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements; ++ SmallDenseSet<AssertingVH<Value>, 4> OverDefined; + }; + +- /// This tracks, on a per-block basis, the set of values that are +- /// over-defined at the end of that block. +- typedef DenseMap<PoisoningVH<BasicBlock>, SmallPtrSet<Value *, 4>> +- OverDefinedCacheTy; +- /// Keep track of all blocks that we have ever seen, so we +- /// don't spend time removing unused blocks from our caches. +- DenseSet<PoisoningVH<BasicBlock> > SeenBlocks; +- +- /// This is all of the cached information for all values, +- /// mapped from Value* to key information. +- DenseMap<Value *, std::unique_ptr<ValueCacheEntryTy>> ValueCache; +- OverDefinedCacheTy OverDefinedCache; +- ++ /// Cached information per basic block. ++ DenseMap<PoisoningVH<BasicBlock>, BlockCacheEntryTy> BlockCache; ++ /// Set of value handles used to erase values from the cache on deletion. ++ DenseSet<LVIValueHandle, DenseMapInfo<Value *>> ValueHandles; + + public: + void insertResult(Value *Val, BasicBlock *BB, + const ValueLatticeElement &Result) { +- SeenBlocks.insert(BB); +- ++ auto &CacheEntry = BlockCache.try_emplace(BB).first->second; + // Insert over-defined values into their own cache to reduce memory + // overhead. + if (Result.isOverdefined()) +- OverDefinedCache[BB].insert(Val); +- else { +- auto It = ValueCache.find_as(Val); +- if (It == ValueCache.end()) { +- ValueCache[Val] = make_unique<ValueCacheEntryTy>(Val, this); +- It = ValueCache.find_as(Val); +- assert(It != ValueCache.end() && "Val was just added to the map!"); +- } +- It->second->BlockVals[BB] = Result; +- } +- } +- +- bool isOverdefined(Value *V, BasicBlock *BB) const { +- auto ODI = OverDefinedCache.find(BB); +- +- if (ODI == OverDefinedCache.end()) +- return false; ++ CacheEntry.OverDefined.insert(Val); ++ else ++ CacheEntry.LatticeElements.insert({ Val, Result }); + +- return ODI->second.count(V); ++ auto HandleIt = ValueHandles.find_as(Val); ++ if (HandleIt == ValueHandles.end()) ++ ValueHandles.insert({ Val, this }); + } + + bool hasCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) +- return true; +- +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) + return false; + +- return I->second->BlockVals.count(BB); ++ return It->second.OverDefined.count(V) || ++ It->second.LatticeElements.count(V); + } + + ValueLatticeElement getCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) ++ return ValueLatticeElement(); ++ ++ if (It->second.OverDefined.count(V)) + return ValueLatticeElement::getOverdefined(); + +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto LatticeIt = It->second.LatticeElements.find(V); ++ if (LatticeIt == It->second.LatticeElements.end()) + return ValueLatticeElement(); +- auto BBI = I->second->BlockVals.find(BB); +- if (BBI == I->second->BlockVals.end()) +- return ValueLatticeElement(); +- return BBI->second; ++ ++ return LatticeIt->second; + } + + /// clear - Empty the cache. + void clear() { +- SeenBlocks.clear(); +- ValueCache.clear(); +- OverDefinedCache.clear(); ++ BlockCache.clear(); ++ ValueHandles.clear(); + } + + /// Inform the cache that a given value has been deleted. +@@ -248,23 +219,18 @@ namespace { + /// OldSucc might have (unless also overdefined in NewSucc). This just + /// flushes elements from the cache and does not add any. + void threadEdgeImpl(BasicBlock *OldSucc,BasicBlock *NewSucc); +- +- friend struct LVIValueHandle; + }; + } + + void LazyValueInfoCache::eraseValue(Value *V) { +- for (auto I = OverDefinedCache.begin(), E = OverDefinedCache.end(); I != E;) { +- // Copy and increment the iterator immediately so we can erase behind +- // ourselves. +- auto Iter = I++; +- SmallPtrSetImpl<Value *> &ValueSet = Iter->second; +- ValueSet.erase(V); +- if (ValueSet.empty()) +- OverDefinedCache.erase(Iter); ++ for (auto &Pair : BlockCache) { ++ Pair.second.LatticeElements.erase(V); ++ Pair.second.OverDefined.erase(V); + } + +- ValueCache.erase(V); ++ auto HandleIt = ValueHandles.find_as(V); ++ if (HandleIt != ValueHandles.end()) ++ ValueHandles.erase(HandleIt); + } + + void LVIValueHandle::deleted() { +@@ -274,18 +240,7 @@ void LVIValueHandle::deleted() { + } + + void LazyValueInfoCache::eraseBlock(BasicBlock *BB) { +- // Shortcut if we have never seen this block. +- DenseSet<PoisoningVH<BasicBlock> >::iterator I = SeenBlocks.find(BB); +- if (I == SeenBlocks.end()) +- return; +- SeenBlocks.erase(I); +- +- auto ODI = OverDefinedCache.find(BB); +- if (ODI != OverDefinedCache.end()) +- OverDefinedCache.erase(ODI); +- +- for (auto &I : ValueCache) +- I.second->BlockVals.erase(BB); ++ BlockCache.erase(BB); + } + + void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, +@@ -303,10 +258,11 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + std::vector<BasicBlock*> worklist; + worklist.push_back(OldSucc); + +- auto I = OverDefinedCache.find(OldSucc); +- if (I == OverDefinedCache.end()) ++ auto I = BlockCache.find(OldSucc); ++ if (I == BlockCache.end() || I->second.OverDefined.empty()) + return; // Nothing to process here. +- SmallVector<Value *, 4> ValsToClear(I->second.begin(), I->second.end()); ++ SmallVector<Value *, 4> ValsToClear(I->second.OverDefined.begin(), ++ I->second.OverDefined.end()); + + // Use a worklist to perform a depth-first search of OldSucc's successors. + // NOTE: We do not need a visited list since any blocks we have already +@@ -320,10 +276,10 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + if (ToUpdate == NewSucc) continue; + + // If a value was marked overdefined in OldSucc, and is here too... +- auto OI = OverDefinedCache.find(ToUpdate); +- if (OI == OverDefinedCache.end()) ++ auto OI = BlockCache.find(ToUpdate); ++ if (OI == BlockCache.end() || OI->second.OverDefined.empty()) + continue; +- SmallPtrSetImpl<Value *> &ValueSet = OI->second; ++ auto &ValueSet = OI->second.OverDefined; + + bool changed = false; + for (Value *V : ValsToClear) { +@@ -333,11 +289,6 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + // If we removed anything, then we potentially need to update + // blocks successors too. + changed = true; +- +- if (ValueSet.empty()) { +- OverDefinedCache.erase(OI); +- break; +- } + } + + if (!changed) continue; +-- +2.24.0 + diff --git a/projects/fenix-rust/build b/projects/fenix-rust/build new file mode 100644 index 0000000..a8f886b --- /dev/null +++ b/projects/fenix-rust/build @@ -0,0 +1,80 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +export PATH="/var/tmp/dist/cmake/bin:$PATH" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] +cd /var/tmp/dist/rust-[% c('var/prev_version') %]-x86_64-unknown-linux-gnu +./install.sh --prefix=$distdir-rust-old +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/osx") %] + # We need to clear `CC` and `LDFLAGS` as they are used for the host platform + # (i.e. Linux). + unset CC + unset LDFLAGS + # Target 10.9 as our toolchain does. Without this explicit declaration Bad + # Things will happen, as a lot of dependent code then assumes that the + # official macOS target, x86_64-apple-darwin, essentially means 10.4. + export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] + # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built + # for x86_64-apple-darwin11. We can't mix those targets as clang gets confused + # that way. Changing the Rust target to x86_64-apple-darwin11 would require a + # fair amount of patching, thus we create symlinks to provide Rust with the + # necessary tools while using our toolchain underneath, targeting 10.9. + cd $cctoolsdir + for f in `ls x86_64-apple-darwin11-*`; do + ln -s $f ${f//x86_64-apple-darwin11/x86_64-apple-darwin} + done + cd .. + ln -s x86_64-apple-darwin11 x86_64-apple-darwin + mkdir $distdir/helper + + # We need to adapt our CFLAGS and make sure our flags are passed down to all + # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort + # to a wrapper script. + cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' +#!/bin/sh +BASEDIR=/var/tmp/dist/macosx-toolchain +$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/MacOSX10.11.sdk/ -Wl,-syslibroot,$BASEDIR/MacOSX10.11.sdk/ -Wl,-dead_strip -Wl,-pie "$@" +EOF + + chmod +x $distdir/helper/x86_64-apple-darwin-clang + export PATH=$distdir/helper:$PATH +[% END %] + +cd $rootdir +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] +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/43909.patch +cd ../../ + +[% 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 [% c("var/configure_opt") %] + +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-rust/config b/projects/fenix-rust/config new file mode 100644 index 0000000..9ad9908 --- /dev/null +++ b/projects/fenix-rust/config @@ -0,0 +1,105 @@ +# vim: filetype=yaml sw=2 +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. +input_file_var: + rust_version: 1.43.0 + prev_version: 1.42.0 + +var: + prev_version: '[% c("input_file_var/prev_version") %]' + container: + use_container: 1 + +targets: + android: + var: + arch_deps: + - libssl-dev + - pkg-config + - zlib1g-dev + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("var/cross_prefix") %] --set=target.[% c("var/cross_prefix") %].cc=[% c("var/CC") %] --set=target.[% c("var/cross_prefix") %].ar=[% c("var/cross_prefix") %]-ar + + android-armv7: + var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=thumbv7neon-linux-androideabi --set=target.thumbv7neon-linux-androideabi.cc=[% c("var/CC") %] --set=target.thumbv7neon-linux-androideabi.ar=[% c("var/cross_prefix") %]-ar + + linux: + var: + deps: + - libc6-dev-i386 + - lib32stdc++6 + - build-essential + - python + - automake + - libssl-dev + - pkg-config + - hardening-wrapper + # We use + # `--enable-local-rust` to avoid downloading the required compiler during + # build time + # + # `--enable-vendor` to avoid downloading crates during build time and just + # use the ones which are shipped with the source + # + # `--enable-extended` to build not only rustc but cargo as well + # + # `--enable-llvm-static-stdccp` to take a libstdc++ on Wheezy into account + # which is too old and if used gives undefined reference errors + # + # `--release-channel=stable` to just include stable features in the + # compiler + # + # `--sysconfdir=etc` to avoid install failures as |make install| wants to + # write to /etc otherwise + # + # the `target` triple to explicitly specify the architecture and platform + # for the compiler/std lib. Ideally, it should not be needed unless one is + # cross-compiling, but compiling `alloc_jemalloc` fails without that in a + # 32bit container. "--host=x86_64-unknown-linux-gnu" is used in its + # configure script in this case. + # `--set=` to explicitly specify the C compiler. We need to compile the + # bundled LLVM and it wants to use `cc`. However, we don't have that in + # our compiled GCC resulting in weird errors due to C and C++ compiler + # version mismatch. We avoid that with this configure option. We need to + # build our own GCC in the first place as 4.7.2 is too old to get all the + # Rust pieces compiled. + configure_opt: --enable-local-rust --enable-vendor --enable-extended --enable-llvm-static-stdcpp --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc + + osx-x86_64: + var: + arch_deps: + - libssl-dev + - pkg-config + - zlib1g-dev + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang + + windows: + var: + arch_deps: + - libssl-dev + - pkg-config + - zlib1g-dev + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-pc-windows-gnu + +input_files: + - project: container-image + - project: cmake + name: cmake + - project: '[% c("var/compiler") %]' + name: '[% c("var/compiler") %]' + - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz' + name: rust + sig_ext: asc + file_gpg_id: 1 + gpg_keyring: rust.gpg + - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-x86_64-unknown-linux-gnu.tar.xz' + name: prev_rust + sig_ext: asc + file_gpg_id: 1 + gpg_keyring: rust.gpg + - filename: unwind.patch + enable: '[% c("var/windows-i686") %]' + - filename: 43909.patch diff --git a/projects/fenix-rust/unwind.patch b/projects/fenix-rust/unwind.patch new file mode 100644 index 0000000..7b22dcb --- /dev/null +++ b/projects/fenix-rust/unwind.patch @@ -0,0 +1,162 @@ +From b3bea7008ece7a5bdf9b5a5dcc95e82febad1854 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 249a183189..df08d6eb0c 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(); ++ ++ // 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. +diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml +index 7d60a17042..d876d0b89a 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/… + std_detect_file_io = [] + std_detect_dlsym_getauxval = [] ++sjlj_eh = ["unwind/sjlj_eh"] +diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml +index 2378b0a315..0b5979ed62 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] ++sjlj_eh = [] +diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs +index 339b554ed6..ec2f93ed60 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); + 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; +@@ -206,26 +201,52 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm + pc + } + } ++} // cfg_if! + +-if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { +- // Not 32-bit iOS ++cfg_if! { ++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() +- 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.23.0.rc0 +

1 0

[tor-browser-build/master] Bug 33760: Update rbm.conf to match NDK 20
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit 336564a4572965ba3f3b8730a93a7e0bf0584107 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 11 09:50:50 2020 +0000 Bug 33760: Update rbm.conf to match NDK 20 Based on a patch by sisbell, thanks! We make it clearer that we are concerned with the cross compilation prefix (so that all the necessary tools can be found) by renaming `configure_host` to `cross_prefix`. Additionally, we reorder the `configure_opt` arguments a bit to closer match other platforms. Finally, we introduce the Fenix related targets to be able to build Tor Browser based on Fennec and Fenix in parallel for the time being. --- rbm.conf | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/rbm.conf b/rbm.conf index 92c3293..9d74a37 100644 --- a/rbm.conf +++ b/rbm.conf @@ -196,9 +196,17 @@ targets: - zip - unzip + torbrowser-android-fenix-armv7: + - android-fenix-armv7 + - android-armv7 + - android-fenix + - android torbrowser-android-armv7: - android-armv7 - android + android-fenix-armv7: + var: + cross_prefix: armv7a-linux-androideabi android-armv7: arch: armv7 var: @@ -207,9 +215,17 @@ targets: toolchain_arch: arm configure_host: arm-linux-androideabi abi: armeabi-v7a + torbrowser-android-fenix-x86: + - android-fenix-x86 + - android-x86 + - android-fenix + - android torbrowser-android-x86: - android-x86 - android + android-fenix-x86: + var: + cross_prefix: i686-linux-android android-x86: arch: x86 var: @@ -218,9 +234,17 @@ targets: toolchain_arch: x86 configure_host: i686-linux-android abi: x86 + torbrowser-android-fenix-x86_64: + - android-fenix-x86_64 + - android-x86_64 + - android-fenix + - android torbrowser-android-x86_64: - android-x86_64 - android + android-fenix-x86_64: + var: + cross_prefix: x86_64-linux-android android-x86_64: arch: x86_64 var: @@ -229,9 +253,17 @@ targets: toolchain_arch: x86_64 configure_host: x86_64-linux-android abi: x86_64 + torbrowser-android-fenix-aarch64: + - android-fenix-aarch64 + - android-aarch64 + - android-fenix + - android torbrowser-android-aarch64: - android-aarch64 - android + android-fenix-aarch64: + var: + cross_prefix: aarch64-linux-android android-aarch64: arch: aarch64 var: @@ -240,17 +272,24 @@ targets: toolchain_arch: arm64 configure_host: aarch64-linux-android abi: arm64-v8a + android-fenix: + var: + android-fenix: 1 + compiler: fenix-android-toolchain + CC: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang' + CXX: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang' + configure_opt: '--host=[% c("var/cross_prefix") %] CC=[% c("var/CC") %] [% c("var/configure_opt_project") %]' android: var: android: 1 compiler: android-toolchain - # API 16 is the minimum we currently support for Tor Browser on Android android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]' - # API 21 is the minimum we currently support for arm64 on Android - android_min_api_aarch64: 21 + # API 16 is the minimum we currently support for 32 bit on Android android_min_api_armv7: 16 android_min_api_x86: 16 + # API 21 is the minimum we currently support for 64 bit on Android android_min_api_x86_64: 21 + android_min_api_aarch64: 21 CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' # We only build snowflake on the alpha and nightly

1 0

[tor-browser-build/master] Bug 33557: Update Android toolchain for Fenix
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit 983cb3322d6b99521aef714babfcaaadac511eab Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 11 09:25:16 2020 +0000 Bug 33557: Update Android toolchain for Fenix Based on a patch by sisbell, thanks! We add a new project to not interfere with Fennec toolchain requirements for now until we stop building Fennec-based Tor Browser for Android. --- projects/fenix-android-toolchain/build | 72 +++++++++++++++++++++++++++++++++ projects/fenix-android-toolchain/config | 70 ++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/projects/fenix-android-toolchain/build b/projects/fenix-android-toolchain/build new file mode 100644 index 0000000..1135ed4 --- /dev/null +++ b/projects/fenix-android-toolchain/build @@ -0,0 +1,72 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +export PROJECT_PATH=/var/tmp/dist/[% project %] +export SDK_HOME=$PROJECT_PATH/android-sdk-linux +export NDK_HOME=$PROJECT_PATH/android-ndk +export GRADLE_HOME=$PROJECT_PATH/gradle +android_release_dir=android-10 +android_release_dir_old=android-9 + +# Make directories +mkdir -p $NDK_HOME $SDK_HOME $GRADLE_HOME + +# Compiler Archives +unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME +unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME +# GeckoView is still using an older Android NDK, bundle it, too. +unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME +unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME +# GeckoView is still using an older Gradle, bundle it, too. +unzip -qq [% c("input_files_by_name/gradle_bin_old") %] -d $GRADLE_HOME +# application-services is using a comparatively new Gradle, bundle it, too. +unzip -qq [% c("input_files_by_name/gradle_bin_new") %] -d $GRADLE_HOME + +# NDK Archive +for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do + cd $NDK_HOME + # Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross + # compilation prefix and the one for all the other tools differ. Let's fix that + # so we only have to take care of one. See: #33557 (comment 2674649). + cd android-ndk-r$version/toolchains/llvm/prebuilt/linux-x86_64/bin + for f in `ls arm-linux-androideabi-*`; do + ln -s $f ${f//arm-linux-androideabi/armv7a-linux-androideabi} + done +done + +# Tool Archives +cd $SDK_HOME +unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME +mkdir -p build-tools/[% c("version") %] +mv $android_release_dir/* build-tools/[% c("version") %] + +# Fenix has not updated to build-tools 29 yet, bundle therefore build-tools 28, +# too. +unzip -qq $HOME/[% c("input_files_by_name/build_tools_old") %] -d $SDK_HOME +mkdir -p build-tools/[% c("version_old") %] +mv $android_release_dir_old/* build-tools/[% c("version_old") %] + +unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME +mkdir -p platforms/android-[% c("var/android_api_level") %] +mv $android_release_dir/* platforms/android-[% c("var/android_api_level") %] + +# Fenix has not updated to Android 29 yet, bundle therefore Android 28, too. +unzip -qq $HOME/[% c("input_files_by_name/platform_old") %] -d $SDK_HOME +mkdir -p platforms/android-[% c("var/android_api_level_old") %] +mv $android_release_dir_old/* platforms/android-[% c("var/android_api_level_old") %] + +unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME + +# That's a quirk required by GeckoView but let's have it here instead of in the +# project's build script +mkdir emulator +cp tools/emulator emulator/ + +# Cleanup +rm -fR $android_release_dir $android_release_dir_old + +# Archive dist directory +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/fenix-android-toolchain/config b/projects/fenix-android-toolchain/config new file mode 100644 index 0000000..c01ca91 --- /dev/null +++ b/projects/fenix-android-toolchain/config @@ -0,0 +1,70 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("version_old") %]-[% c("var/build_id") %].tar.gz' +version: 29.0.3 +version_old: 28.0.3 +var: + container: + use_container: 1 + deps: + - unzip + - python + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] + export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux + # By default we use the old NDK which is the one GeckoView is using. + # However, we can overwrite that per project if needed (e.g. + # application-services is currently on a newer NDK). + export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk/android-ndk-r[% c("var/android_ndk_version_old") %] + export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + export ANDROID_HOME=$ANDROID_SDK_HOME + export GRADLE_USER_HOME=$GRADLE_HOME + export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle_version") %]/bin + google_repo: https://dl.google.com/android/repository + android_api_level: 29 + android_api_level_old: 28 + android_platform_revision: 04 + android_ndk_version: 21 + android_ndk_version_old: 20 + android_ndk_revision: d + gradle_version_new: 6.3 + gradle_version: 5.6.4 + gradle_version_old: 5.1.1 +input_files: + - project: container-image + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' + name: build_tools + sha256sum: 5652d8cd5eaaade0b853bfe0ae6cbfa0706a6f70a0ebb25ca24a6f484ec3d855 + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version_old") %]-linux.zip' + name: build_tools_old + sha256sum: 7954956a40633c88f693d638cbc23f68e9e2499dc7a4b7dfdaf6a3e91387749a + - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") %]_r[% c("var/android_platform_revision") %].zip' + name: platform + sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69 + - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_old") %]_r[% c("var/android_platform_revision") %].zip' + name: platform_old + sha256sum: 967f8ca99b71d337aa9c7781f9d65dd8110bf5c4746f44304047bf71b20d0ded + # ./mach bootstrap is fetching the latest version, so it does not seem to + # matter which particular version we are using. Pin to the one fitting best to + # SDK version/build-tools version. + - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip' + name: platform_tools + sha256sum: 49e676ec90bff1f7d7dfe4fb7d0ab78e14fa8fb06a8dccca2ef57a1bc29497a0 + - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' + name: android_sdk_tools + sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 + - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux-x86_64.zip' + name: android_ndk_compiler + sha256sum: dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd + - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' + name: android_ndk_compiler_old + sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_new") %]-bin.zip + name: gradle_bin_new + sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768 + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip + name: gradle_bin + sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_old") %]-bin.zip + name: gradle_bin_old + sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798

1 0

[tor-browser-build/master] Bug 34012: Bump cbindgen to 0.14.3
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit afde138413480325be06b290b652397e85cdff5a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 11 10:11:29 2020 +0000 Bug 34012: Bump cbindgen to 0.14.3 We add a new project to not interfere with non-mobile toolchain requirements for now until both series are moved to the non-ESR release train. --- projects/fenix-cbindgen/build | 32 ++++++++++++++++++++++++++++++++ projects/fenix-cbindgen/config | 16 ++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/projects/fenix-cbindgen/build b/projects/fenix-cbindgen/build new file mode 100644 index 0000000..c63a783 --- /dev/null +++ b/projects/fenix-cbindgen/build @@ -0,0 +1,32 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] +mkdir -p $distdir/[% project %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %] +export PATH="/var/tmp/dist/fenix-rust/bin:$PATH" +mkdir -p /var/tmp/build +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-[% c('version') %].tar.bz2 +cd $builddir +mkdir .cargo +cat > .cargo/config << 'EOF' +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "/var/tmp/build/fenix-cbindgen/vendor" +EOF + +cargo build --release --frozen --target x86_64-unknown-linux-gnu +mv target/x86_64-unknown-linux-gnu/release/cbindgen $distdir/[% project %] + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/fenix-cbindgen/config b/projects/fenix-cbindgen/config new file mode 100644 index 0000000..c081451 --- /dev/null +++ b/projects/fenix-cbindgen/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: 0.14.3 +git_url: https://github.com/eqrion/cbindgen +git_hash: cc2876f709808a52d132a5f84e53ca1964eb92db # v0.14.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 +input_files: + - project: container-image + - name: rust + project: fenix-rust + # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources. + - URL: https://people.torproject.org/~gk/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 + sha256sum: cc47db55a1c937e7bcd1cbd8664964656a4922bc35175d95c4015d452f2dcb2b

1 0

[tor-browser-build/master] Bug 34011: Bump clang to 9.0.1
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit 1555bfb9d7dafa42c18ef04c0763c884f4862f22 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 11 09:54:09 2020 +0000 Bug 34011: Bump clang to 9.0.1 We add a new project to not interfere with non-mobile toolchain requirements for now until both series are moved to the non-ESR release train. --- projects/fenix-clang/43909.patch | 252 +++++++++++++++++++++++++++++++++++++++ projects/fenix-clang/build | 45 +++++++ projects/fenix-clang/config | 36 ++++++ 3 files changed, 333 insertions(+) diff --git a/projects/fenix-clang/43909.patch b/projects/fenix-clang/43909.patch new file mode 100644 index 0000000..78d2a75 --- /dev/null +++ b/projects/fenix-clang/43909.patch @@ -0,0 +1,252 @@ +From c95310f2d4fd3c88241c3b5d6dbf6251d34a3256 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita.ppv(a)gmail.com> +Date: Sat, 16 Nov 2019 16:22:18 +0100 +Subject: [PATCH] Restructure caching + +Variant on D70103. The caching is switched to always use a BB to +cache entry map, which then contains per-value caches. A separate +set contains value handles with a deletion callback. This allows us +to properly invalidate overdefined values. + +A possible alternative would be to always cache by value first and +have per-BB maps/sets in the each cache entry. In that case we could +use a ValueMap and would avoid the separate value handle set. I went +with the BB indexing at the top level to make it easier to integrate +D69914, but possibly that's not the right choice. + +Differential Revision: https://reviews.llvm.org/D70376 + +diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp +index 110c085d3f3..aa6862cb588 100644 +--- a/llvm/lib/Analysis/LazyValueInfo.cpp ++++ b/llvm/lib/Analysis/LazyValueInfo.cpp +@@ -133,12 +133,9 @@ namespace { + /// A callback value handle updates the cache when values are erased. + class LazyValueInfoCache; + struct LVIValueHandle final : public CallbackVH { +- // Needs to access getValPtr(), which is protected. +- friend struct DenseMapInfo<LVIValueHandle>; +- + LazyValueInfoCache *Parent; + +- LVIValueHandle(Value *V, LazyValueInfoCache *P) ++ LVIValueHandle(Value *V, LazyValueInfoCache *P = nullptr) + : CallbackVH(V), Parent(P) { } + + void deleted() override; +@@ -152,89 +149,63 @@ namespace { + /// This is the cache kept by LazyValueInfo which + /// maintains information about queries across the clients' queries. + class LazyValueInfoCache { +- /// This is all of the cached block information for exactly one Value*. +- /// The entries are sorted by the BasicBlock* of the +- /// entries, allowing us to do a lookup with a binary search. +- /// Over-defined lattice values are recorded in OverDefinedCache to reduce +- /// memory overhead. +- struct ValueCacheEntryTy { +- ValueCacheEntryTy(Value *V, LazyValueInfoCache *P) : Handle(V, P) {} +- LVIValueHandle Handle; +- SmallDenseMap<PoisoningVH<BasicBlock>, ValueLatticeElement, 4> BlockVals; ++ /// This is all of the cached information for one basic block. It contains ++ /// the per-value lattice elements, as well as a separate set for ++ /// overdefined values to reduce memory usage. ++ struct BlockCacheEntryTy { ++ SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements; ++ SmallDenseSet<AssertingVH<Value>, 4> OverDefined; + }; + +- /// This tracks, on a per-block basis, the set of values that are +- /// over-defined at the end of that block. +- typedef DenseMap<PoisoningVH<BasicBlock>, SmallPtrSet<Value *, 4>> +- OverDefinedCacheTy; +- /// Keep track of all blocks that we have ever seen, so we +- /// don't spend time removing unused blocks from our caches. +- DenseSet<PoisoningVH<BasicBlock> > SeenBlocks; +- +- /// This is all of the cached information for all values, +- /// mapped from Value* to key information. +- DenseMap<Value *, std::unique_ptr<ValueCacheEntryTy>> ValueCache; +- OverDefinedCacheTy OverDefinedCache; +- ++ /// Cached information per basic block. ++ DenseMap<PoisoningVH<BasicBlock>, BlockCacheEntryTy> BlockCache; ++ /// Set of value handles used to erase values from the cache on deletion. ++ DenseSet<LVIValueHandle, DenseMapInfo<Value *>> ValueHandles; + + public: + void insertResult(Value *Val, BasicBlock *BB, + const ValueLatticeElement &Result) { +- SeenBlocks.insert(BB); +- ++ auto &CacheEntry = BlockCache.try_emplace(BB).first->second; + // Insert over-defined values into their own cache to reduce memory + // overhead. + if (Result.isOverdefined()) +- OverDefinedCache[BB].insert(Val); +- else { +- auto It = ValueCache.find_as(Val); +- if (It == ValueCache.end()) { +- ValueCache[Val] = make_unique<ValueCacheEntryTy>(Val, this); +- It = ValueCache.find_as(Val); +- assert(It != ValueCache.end() && "Val was just added to the map!"); +- } +- It->second->BlockVals[BB] = Result; +- } +- } +- +- bool isOverdefined(Value *V, BasicBlock *BB) const { +- auto ODI = OverDefinedCache.find(BB); +- +- if (ODI == OverDefinedCache.end()) +- return false; ++ CacheEntry.OverDefined.insert(Val); ++ else ++ CacheEntry.LatticeElements.insert({ Val, Result }); + +- return ODI->second.count(V); ++ auto HandleIt = ValueHandles.find_as(Val); ++ if (HandleIt == ValueHandles.end()) ++ ValueHandles.insert({ Val, this }); + } + + bool hasCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) +- return true; +- +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) + return false; + +- return I->second->BlockVals.count(BB); ++ return It->second.OverDefined.count(V) || ++ It->second.LatticeElements.count(V); + } + + ValueLatticeElement getCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) ++ return ValueLatticeElement(); ++ ++ if (It->second.OverDefined.count(V)) + return ValueLatticeElement::getOverdefined(); + +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto LatticeIt = It->second.LatticeElements.find(V); ++ if (LatticeIt == It->second.LatticeElements.end()) + return ValueLatticeElement(); +- auto BBI = I->second->BlockVals.find(BB); +- if (BBI == I->second->BlockVals.end()) +- return ValueLatticeElement(); +- return BBI->second; ++ ++ return LatticeIt->second; + } + + /// clear - Empty the cache. + void clear() { +- SeenBlocks.clear(); +- ValueCache.clear(); +- OverDefinedCache.clear(); ++ BlockCache.clear(); ++ ValueHandles.clear(); + } + + /// Inform the cache that a given value has been deleted. +@@ -248,23 +219,18 @@ namespace { + /// OldSucc might have (unless also overdefined in NewSucc). This just + /// flushes elements from the cache and does not add any. + void threadEdgeImpl(BasicBlock *OldSucc,BasicBlock *NewSucc); +- +- friend struct LVIValueHandle; + }; + } + + void LazyValueInfoCache::eraseValue(Value *V) { +- for (auto I = OverDefinedCache.begin(), E = OverDefinedCache.end(); I != E;) { +- // Copy and increment the iterator immediately so we can erase behind +- // ourselves. +- auto Iter = I++; +- SmallPtrSetImpl<Value *> &ValueSet = Iter->second; +- ValueSet.erase(V); +- if (ValueSet.empty()) +- OverDefinedCache.erase(Iter); ++ for (auto &Pair : BlockCache) { ++ Pair.second.LatticeElements.erase(V); ++ Pair.second.OverDefined.erase(V); + } + +- ValueCache.erase(V); ++ auto HandleIt = ValueHandles.find_as(V); ++ if (HandleIt != ValueHandles.end()) ++ ValueHandles.erase(HandleIt); + } + + void LVIValueHandle::deleted() { +@@ -274,18 +240,7 @@ void LVIValueHandle::deleted() { + } + + void LazyValueInfoCache::eraseBlock(BasicBlock *BB) { +- // Shortcut if we have never seen this block. +- DenseSet<PoisoningVH<BasicBlock> >::iterator I = SeenBlocks.find(BB); +- if (I == SeenBlocks.end()) +- return; +- SeenBlocks.erase(I); +- +- auto ODI = OverDefinedCache.find(BB); +- if (ODI != OverDefinedCache.end()) +- OverDefinedCache.erase(ODI); +- +- for (auto &I : ValueCache) +- I.second->BlockVals.erase(BB); ++ BlockCache.erase(BB); + } + + void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, +@@ -303,10 +258,11 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + std::vector<BasicBlock*> worklist; + worklist.push_back(OldSucc); + +- auto I = OverDefinedCache.find(OldSucc); +- if (I == OverDefinedCache.end()) ++ auto I = BlockCache.find(OldSucc); ++ if (I == BlockCache.end() || I->second.OverDefined.empty()) + return; // Nothing to process here. +- SmallVector<Value *, 4> ValsToClear(I->second.begin(), I->second.end()); ++ SmallVector<Value *, 4> ValsToClear(I->second.OverDefined.begin(), ++ I->second.OverDefined.end()); + + // Use a worklist to perform a depth-first search of OldSucc's successors. + // NOTE: We do not need a visited list since any blocks we have already +@@ -320,10 +276,10 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + if (ToUpdate == NewSucc) continue; + + // If a value was marked overdefined in OldSucc, and is here too... +- auto OI = OverDefinedCache.find(ToUpdate); +- if (OI == OverDefinedCache.end()) ++ auto OI = BlockCache.find(ToUpdate); ++ if (OI == BlockCache.end() || OI->second.OverDefined.empty()) + continue; +- SmallPtrSetImpl<Value *> &ValueSet = OI->second; ++ auto &ValueSet = OI->second.OverDefined; + + bool changed = false; + for (Value *V : ValsToClear) { +@@ -333,11 +289,6 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + // If we removed anything, then we potentially need to update + // blocks successors too. + changed = true; +- +- if (ValueSet.empty()) { +- OverDefinedCache.erase(OI); +- break; +- } + } + + if (!changed) continue; +-- +2.24.0 + diff --git a/projects/fenix-clang/build b/projects/fenix-clang/build new file mode 100644 index 0000000..c8cceb4 --- /dev/null +++ b/projects/fenix-clang/build @@ -0,0 +1,45 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +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") %] + # 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 -%] +mkdir -p /var/tmp/build +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/llvm') %] +tar -xf $rootdir/[% c('input_files_by_name/clang') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] +tar -xf $rootdir/[% c('input_files_by_name/lld') %] +tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] +mv llvm-* llvm +# LLVM has reproducibility issues when optimizing bitcode, which we need to +# patch. See: #32053 for more details. +patch -p1 < $rootdir/43909.patch +mv clang-* llvm/tools/clang +mv libcxx-* llvm/projects/libcxx +mv libcxxabi-* llvm/projects/libcxxabi +mv lld-* llvm/tools/lld +mv compiler-rt-* llvm/projects/compiler-rt +cd llvm +export LLVM_HOME=$(pwd) +mkdir build +cd build +cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] + $LLVM_HOME +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-clang/config b/projects/fenix-clang/config new file mode 100644 index 0000000..8f16354 --- /dev/null +++ b/projects/fenix-clang/config @@ -0,0 +1,36 @@ +# vim: filetype=yaml sw=2 +version: 9.0.1 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +gpg_keyring: clang.gpg +sig_ext: sig + +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' + - project: cmake + name: cmake + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' + name: llvm + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/clang-[% c("version") %].src.tar.xz' + name: clang + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' + name: libcxx + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' + name: libcxxabi + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/lld-[% c("version") %].src.tar.xz' + name: lld + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' + name: compiler-rt + file_gpg_id: 1 + - filename: 43909.patch

1 0

[tor-browser-build/master] Bug 34013: Bump Node to v10.21.0
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit 15a7d9551bf4c6048caa659d74a689c5dfbe2d4b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 11 10:14:56 2020 +0000 Bug 34013: Bump Node to v10.21.0 We add a new project to not interfere with non-mobile toolchain requirements for now until both series are moved to the non-ESR release train. --- projects/fenix-node/build | 24 ++++++++++++++++++++++++ projects/fenix-node/config | 18 ++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/projects/fenix-node/build b/projects/fenix-node/build new file mode 100644 index 0000000..8cc8ea5 --- /dev/null +++ b/projects/fenix-node/build @@ -0,0 +1,24 @@ +#!/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 new file mode 100644 index 0000000..b3534f4 --- /dev/null +++ b/projects/fenix-node/config @@ -0,0 +1,18 @@ +# 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

1 0

[tor-browser-build/master] Bug 34014: Enable sqlite3 support in Python
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit 49ebf71c779e8af289a3377b4698c79d70872123 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 22 15:20:56 2020 +0000 Bug 34014: Enable sqlite3 support in Python --- projects/python/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/python/config b/projects/python/config index 10c79cc..a5caece 100644 --- a/projects/python/config +++ b/projects/python/config @@ -10,6 +10,7 @@ var: - python-all - zlib1g-dev - libssl-dev + - libsqlite3-dev setup: | mkdir -p /var/tmp/dist

1 0