Changeset 2026bb6 for driver

Timestamp:

Jul 19, 2019, 10:31:53 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8ac3b0e

Parents:

6f15121

Message:

More robust fix for optionally linking threads

File:

• driver/cfa.cc (modified) (2 diffs)

driver/cfa.cc ¶

@@ -405 +405 @@
                 args[nargs] = "--undefined=__cfaabi_appready_startup";
                 nargs += 1;
-                args[nargs] = "-Xlinker";
-                nargs += 1;
-                args[nargs] = "--undefined=__cfaabi_dbg_record";
-                nargs += 1;
 
                 // include the cfa library in case it's needed
@@ -414 +410 @@
                 nargs += 1;
                 args[nargs] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
+                nargs += 1;
+                args[nargs] = "-Wl,--push-state,--as-needed";
+                nargs += 1;
+                args[nargs] = "-lcfathread";
+                nargs += 1;
+                args[nargs] = "-Wl,--pop-state";
                 nargs += 1;
                 args[nargs] = "-lcfa";