-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 1841902 - Patch ld64 to avoid dead-stripping rust compiler_builti…
…ns atoms. r=firefox-build-system-reviewers,ahochheiden Sent upstream at tpoechtrager/cctools-port#135. Differential Revision: https://phabricator.services.mozilla.com/D182833
- Loading branch information
Showing
2 changed files
with
19 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/cctools/ld64/src/ld/Resolver.cpp b/cctools/ld64/src/ld/Resolver.cpp | ||
index bfb67a3..d5b1c67 100644 | ||
--- a/cctools/ld64/src/ld/Resolver.cpp | ||
+++ b/cctools/ld64/src/ld/Resolver.cpp | ||
@@ -1178,9 +1178,10 @@ void Resolver::deadStripOptimize(bool force) | ||
// unset liveness, so markLive() will recurse | ||
(const_cast<ld::Atom*>(atom))->setLive(0); | ||
} | ||
- // <rdar://problem/49468634> if doing LTO, mark all libclang_rt* mach-o atoms as live since the backend may suddenly codegen uses of them | ||
+ // <rdar://problem/49468634> if doing LTO, mark all libclang_rt* mach-o atoms as live since the backend may suddenly codegen uses of them. | ||
+ // Likewise with rust compiler_builtins atoms. They may come from a libcompiler_builtins-<hash>.a lib, or from a compiler_builtins-... member of a rust static library. | ||
else if ( _haveLLVMObjs && !force && (atom->contentType() != ld::Atom::typeLTOtemporary) ) { | ||
- if ( strstr(atom->safeFilePath(), "libclang_rt") != nullptr ) { | ||
+ if ( strstr(atom->safeFilePath(), "libclang_rt") != nullptr || strstr(atom->safeFilePath(), "compiler_builtins") != nullptr ) { | ||
_deadStripRoots.insert(atom); | ||
} | ||
} |