Changeset 7030dab for driver/cfa.cc

Timestamp:

Apr 6, 2020, 4:46:28 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into new-ast

File:

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

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Sep 10 17:00:15 2019
-// Update Count     : 420
+// Last Modified On : Fri Jan 31 16:48:03 2020
+// Update Count     : 421
 //
 
@@ -187 +187 @@
                         } else if ( arg == "-XCFA" ) {                          // CFA pass through
                                 i += 1;
+                                if ( i == argc ) continue;                              // next argument available ?
                                 Putenv( argv, argv[i] );
 
@@ -401 +402 @@
                 args[nargs++] = "-Xlinker";
                 args[nargs++] = "--undefined=__cfaabi_appready_startup";
+                args[nargs++] = "-z";
+                args[nargs++] = "execstack";
 
                 // include the cfa library in case it is needed
@@ -408 +411 @@
                 args[nargs++] = "-lcfathread";
                 args[nargs++] = "-Wl,--pop-state";
+                args[nargs++] = "-Wl,--push-state,--no-as-needed";
                 args[nargs++] = "-lcfa";
-                args[nargs++] = "-lpthread";
+                args[nargs++] = "-Wl,--pop-state";
+                args[nargs++] = "-pthread";
                 args[nargs++] = "-ldl";
                 args[nargs++] = "-lrt";