Changeset 0aa20e3

Timestamp:

Jul 16, 2020, 5:30:03 PM (5 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

Children:

527acfc

Parents:

cf48a14

Message:

Added support for syntax -XCFA,OPTION instead of -XCFA OPTION in cfa.cc.
Now using -XCFA,-l syntax for prelude.cfa to fix distcc error

Files:

• driver/cfa.cc (modified) (1 diff)
• libcfa/src/Makefile.am (modified) (1 diff)
• libcfa/src/Makefile.in (modified) (1 diff)

driver/cfa.cc

@@ -185 +185 @@
                                 args[nargs++] = argv[i];                                // pass argument along
                                 if ( arg == "-o" ) o_file = i;                  // remember file
-                        } else if ( arg == "-XCFA" ) {                          // CFA pass through
-                                i += 1;
-                                if ( i == argc ) continue;                              // next argument available ?
-                                Putenv( argv, argv[i] );
-
-                                // CFA specific arguments
+                        } else if ( strncmp(arg.c_str(), "-XCFA", 5) == 0 ) {                           // CFA pass through
+                                if(arg.size() == 5) {
+                                        i += 1;
+                                        if ( i == argc ) continue;                              // next argument available ?
+                                        Putenv( argv, argv[i] );
+
+                                        // CFA specific arguments
+                                }
+                                else if(arg[5] == ',') {
+                                        Putenv( argv, argv[i] + 6 );
+                                        printf("%s\n", argv[i] + 6 );
+                                        // CFA specific arguments
+                                }
+                                else {
+                                        args[nargs++] = argv[i];
+                                }
 
                         } else if ( arg == "-CFA" ) {

libcfa/src/Makefile.am

@@ -100 +100 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
-        ${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
+        ${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
         ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-        $(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
+        $(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------

libcfa/src/Makefile.in

@@ -984 +984 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
-        ${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
+        ${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
         ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-        $(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
+        $(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------