Changeset 794db28 for driver/cc1.cc

Timestamp:

Aug 18, 2020, 11:35:50 AM (4 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:

93526ef

Parents:

d2b5d2d (diff), 36de20d (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

File:

• driver/cc1.cc (modified) (9 diffs)

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 13 21:03:15 2020
-// Update Count     : 407
+// Last Modified On : Sun Aug 16 21:03:02 2020
+// Update Count     : 413
 //
 
@@ -24 +24 @@
 #include <unistd.h>                                                                             // execvp, fork, unlink
 #include <sys/wait.h>                                                                   // wait
-#include <fcntl.h>
+#include <fcntl.h>                                                                              // creat
 
 
@@ -59 +59 @@
 
 
-static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );               // "N__=" suffix
+static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );               // "__CFA_FLAG__=" suffix
 
 static void checkEnv1( const char * args[], int & nargs ) { // stage 1
@@ -111 +111 @@
 } // checkEnv2
 
-
-static char tmpname[] = P_tmpdir "/CFAXXXXXX.ifa";
+#define CFA_SUFFIX ".ifa"
+
+static char tmpname[] = P_tmpdir "/CFAXXXXXX" CFA_SUFFIX;
 static int tmpfilefd = -1;
 static bool startrm = false;
@@ -321 +322 @@
 
         if ( WIFSIGNALED(code) ) {                                                      // child failed ?
+                rmtmpfile();                                                                    // remove tmpname
                 cerr << "CC1 Translator error: stage 1, child failed " << WTERMSIG(code) << endl;
                 exit( EXIT_FAILURE );
         } // if
 
-        exit( WEXITSTATUS(code) );                                                      // bad cpp result stops top-level gcc
+        exit( WEXITSTATUS( code ) );                                            // bad cpp result stops top-level gcc
 } // Stage1
 
@@ -373 +375 @@
                         } else if ( arg == "-fno-diagnostics-color" ) {
                                 color_arg = Color_Auto;
-                        }
+                        } // if
 
                         if ( arg == "-quiet" || arg == "-version" || arg == "-fpreprocessed" ||
-                                // Currently CFA does not suppose precompiled .h files.
-                                prefix( arg, "--output-pch" ) ) {
+                                 // Currently CFA does not suppose precompiled .h files.
+                                 prefix( arg, "--output-pch" ) ) {
 
                                 // strip inappropriate flags with an argument
@@ -441 +443 @@
                         } // if
 
-                        cfa_cpp_out = cfa_cpp_out.substr( 0, dot ) + ".ifa";
+                        cfa_cpp_out = cfa_cpp_out.substr( 0, dot ) + CFA_SUFFIX;
                         if ( creat( cfa_cpp_out.c_str(), 0666 ) == -1 ) {
                                 perror( "CC1 Translator error: stage 2, creat" );
@@ -462 +464 @@
         // output.  Otherwise, run the cfa-cpp preprocessor on the temporary file and save the result into the output file.
 
-        if ( fork() == 0 ) {                                                            // child runs CFA
+        if ( fork() == 0 ) {                                                            // child runs CFA preprocessor
                 cargs[0] = ( *new string( bprefix + "cfa-cpp" ) ).c_str();
                 cargs[ncargs++] = cpp_in;
@@ -520 +522 @@
         #endif // __DEBUG_H__
 
-        if ( fork() == 0 ) {                                                            // child runs CFA
+        if ( fork() == 0 ) {                                                            // child runs gcc
                 args[0] = compiler_path.c_str();
                 args[nargs++] = "-S";                                                   // only compile and put assembler output in specified file