Changeset c76bd34 for libcfa/src/parseargs.cfa

Timestamp:

Oct 7, 2020, 4:31:43 PM (5 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

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

Children:

848439f

Parents:

ae2c27a (diff), 597c5d18 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc into master

File:

• libcfa/src/parseargs.cfa (modified) (1 diff)

libcfa/src/parseargs.cfa

@@ -25 +25 @@
 #include "limits.hfa"
 
-extern int cfa_args_argc;
-extern char ** cfa_args_argv;
-extern char ** cfa_args_envp;
+extern int cfa_args_argc __attribute__((weak));
+extern char ** cfa_args_argv __attribute__((weak));
+extern char ** cfa_args_envp __attribute__((weak));
 
 static void usage(char * cmd, cfa_option options[], size_t opt_count, const char * usage, FILE * out)  __attribute__ ((noreturn));
 
 void parse_args( cfa_option options[], size_t opt_count, const char * usage, char ** & left ) {
-        parse_args(cfa_args_argc, cfa_args_argv, options, opt_count, usage, left );
+        if( 0p != &cfa_args_argc ) {
+                parse_args(cfa_args_argc, cfa_args_argv, options, opt_count, usage, left );
+        }
+        else {
+                char * temp = "";
+                parse_args(0, &temp, options, opt_count, usage, left );
+        }
 }