Changeset 381bea6 for driver/cfa.cc

Timestamp:

Aug 27, 2018, 5:53:45 PM (5 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

e5ea867

Parents:

b7c89aa (diff), 2a9d12d (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 cleanup-dtors

File:

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

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 10 18:17:58 2018
-// Update Count     : 259
+// Last Modified On : Thu Aug 23 15:41:55 2018
+// Update Count     : 270
 //
 
@@ -43 +43 @@
 const string suffixes[NumSuffixes] = { "cfa", "hfa", };
 
-bool suffix( string arg ) {
+void suffix( string arg, const char * args[], int & nargs ) {
         //std::cerr << arg << std::endl;
         size_t dot = arg.find_last_of( "." );
         //std::cerr << dot << " " << (dot != string::npos ? arg.substr( dot + 1 ) : "fred" ) << std::endl;
-        if ( dot == string::npos ) return false;
+        if ( dot == string::npos ) return;
         string sx = arg.substr( dot + 1 );
         for ( int i = 0; i < NumSuffixes; i += 1 ) {
-                if ( sx == suffixes[i] ) return true;
+                if ( sx == suffixes[i] ) {
+                        args[nargs] = "-x";
+                        nargs += 1;
+                        args[nargs] = "c";
+                        nargs += 1;
+                        return;
+                } // if
         } // for
-        return false;
 } // suffix
 
@@ -86 +91 @@
         string Major( str( CFA_VERSION_MAJOR ) ), Minor( str( CFA_VERSION_MINOR ) ), Patch( str( CFA_VERSION_PATCH ) );
 
-        string installincdir( CFA_INCDIR );                         // fixed location of include files
-        string installlibdir( CFA_LIBDIR );                         // fixed location of cc1 and cfa-cpp commands when installed
-        string srcdriverdir ( TOP_BUILDDIR "driver");                // fixed location of cc1 and cfa-cpp commands when in tree
+        string installincdir( CFA_INCDIR );                                     // fixed location of include files
+        string installlibdir( CFA_LIBDIR );                                     // fixed location of cc1 and cfa-cpp commands when installed
+        string srcdriverdir ( TOP_BUILDDIR "driver");           // fixed location of cc1 and cfa-cpp commands when in tree
 
         string heading;                                                                         // banner printed at start of cfa compilation
@@ -178 +183 @@
                                 if ( i == argc ) continue;                              // next argument available ?
                                 compiler_path = argv[i];
-                                if ( putenv( (char *)( *new string( string( "__U_COMPILER__=" ) + argv[i]) ).c_str() ) != 0 ) {
+                                if ( putenv( (char *)( *new string( string( "__CFA_COMPILER__=" ) + argv[i]) ).c_str() ) != 0 ) {
                                         cerr << argv[0] << " error, cannot set environment variable." << endl;
                                         exit( EXIT_FAILURE );
@@ -294 +299 @@
                 } else {
                         bool opt = false;
-                        if ( ! xflag && suffix( arg ) ) {
-                                args[nargs] = "-x";
-                                nargs += 1;
-                                args[nargs] = "c";
-                                nargs += 1;
+                        if ( ! xflag ) {
+                                suffix( arg, args, nargs );                             // check suffix
                                 // args[nargs] = ( *new string( string("-D__GCC_X__=c") ) ).c_str(); // add the argument for -x
                                 // nargs += 1;
@@ -341 +343 @@
                 args[nargs] = "-I" CFA_INCDIR;
                 nargs += 1;
-                if ( ! noincstd_flag ) {                                                        // do not use during build
-                        args[nargs] = "-I" CFA_INCDIR "/stdhdr";
+                if ( ! noincstd_flag ) {                                                // do not use during build
+                        args[nargs] = "-I" CFA_INCDIR "stdhdr";
                         nargs += 1;
                 } // if
-                args[nargs] = "-I" CFA_INCDIR "/concurrency";
-                nargs += 1;
-                args[nargs] = "-I" CFA_INCDIR "/containers";
+                args[nargs] = "-I" CFA_INCDIR "concurrency";
+                nargs += 1;
+                args[nargs] = "-I" CFA_INCDIR "containers";
                 nargs += 1;
         } else {
                 args[nargs] = "-I" TOP_SRCDIR "libcfa/src";
                 nargs += 1;
-                if ( ! noincstd_flag ) {                                                        // do not use during build
+                if ( ! noincstd_flag ) {                                                // do not use during build
                         args[nargs] = "-I" TOP_SRCDIR "libcfa/src" "/stdhdr";
                         nargs += 1;
@@ -377 +379 @@
         }
 
-        const char * const arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
+        string arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
+        if ( ! m32 && ! m64 && arch == "x86" ) {                        // no override and 32-bit architecture
+                args[nargs] = "-m32";
+                nargs += 1;
+        } // if
         const char * config = debug ? "debug": "nodebug";
         string libdir = libbase + arch + "-" + config;
-        if( !dirExists(libdir) ) {
+
+        if ( ! dirExists( libdir ) ) {
                 cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
                 cerr << "Was looking for " << libdir << endl;
                 libdir = libbase + arch + "-" + "nolib";
-        }
-
-        if( !dirExists(libdir) ) {
+        } // if
+
+        if ( ! dirExists( libdir ) ) {
                 cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
                 cerr << "Was looking for " << libdir << endl;
                 exit( EXIT_FAILURE );
-        }
+        } // if
 
         args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir + (intree ? "/prelude" : "")) ).c_str();
@@ -470 +477 @@
 
         if ( Bprefix.length() == 0 ) {
-                Bprefix = !intree ? installlibdir : srcdriverdir;
+                Bprefix = ! intree ? installlibdir : srcdriverdir;
+                if ( Bprefix[Bprefix.length() - 1] != '/' ) Bprefix += '/';
                 args[nargs] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str();
                 nargs += 1;
@@ -504 +512 @@
                 args[nargs] = "-D__int8_t_defined";                             // prevent gcc type-size attributes
                 nargs += 1;
-                args[nargs] = ( *new string( string("-B") + Bprefix + "/" ) ).c_str();
+                args[nargs] = ( *new string( string("-B") + Bprefix ) ).c_str();
                 nargs += 1;
                 args[nargs] = "-lm";