summaryrefslogtreecommitdiffstats
path: root/taskcluster/scripts/misc/cctools.patch
diff options
context:
space:
mode:
Diffstat (limited to 'taskcluster/scripts/misc/cctools.patch')
-rw-r--r--taskcluster/scripts/misc/cctools.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/taskcluster/scripts/misc/cctools.patch b/taskcluster/scripts/misc/cctools.patch
new file mode 100644
index 0000000000..8e11708465
--- /dev/null
+++ b/taskcluster/scripts/misc/cctools.patch
@@ -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);
+ }
+ }