Changeset cdbab55 for driver/cfa.cc

Timestamp:

Aug 21, 2018, 2:24:29 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

2a6292d

Parents:

2b79a70 (diff), efa8b6af (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:/u/cforall/software/cfa/cfa-cc

File:

• driver/cfa.cc (moved) (moved from src/driver/cfa.cc ) (11 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 Jul 13 17:40:12 2018
-// Update Count     : 258
+// Last Modified On : Fri Aug 10 18:17:58 2018
+// Update Count     : 259
 //
 
@@ -20 +20 @@
 #include <string>                                                                               // STL version
 #include <string.h>                                                                             // strcmp
+
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "Common/SemanticError.h"
@@ -66 +69 @@
 } // shuffle
 
+static inline bool dirExists(const string & path) {
+    struct stat info;
+    if(stat( path.c_str(), &info ) != 0)
+        return false;
+    else if(info.st_mode & S_IFDIR)
+        return true;
+    else
+        return false;
+} //dirExists
+
 
 #define str(s) #s
@@ -73 +86 @@
         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
+        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
@@ -96 +110 @@
         bool xflag = false;                                                                     // user supplied -x flag
         bool debugging __attribute(( unused )) = false;         // -g flag
+        bool m32 = false;                                    // -m32 flag
+        bool m64 = false;                                    // -m64 flag
+        bool intree = false;
 
         const char *args[argc + 100];                                           // cfa command line values, plus some space for additional flags
@@ -154 +171 @@
                         } else if ( arg == "-no-include-stdhdr" ) {
                                 noincstd_flag = true;                                   // strip the no-include-stdhdr flag
+                        } else if ( arg == "-in-tree" ) {
+                                intree = true;
                         } else if ( arg == "-compiler" ) {
                                 // use the user specified compiler
@@ -258 +277 @@
                                 libs[nlibs] = argv[i];
                                 nlibs += 1;
+                        } else if ( arg == "-m32" ) {
+                                m32 = true;
+                                m64 = false;
+                                args[nargs] = argv[i];
+                                nargs += 1;
+                        } else if ( arg == "-m64" ) {
+                                m64 = true;
+                                m32 = false;
+                                args[nargs] = argv[i];
+                                nargs += 1;
                         } else {
                                 // concatenate any other arguments
@@ -309 +338 @@
 
         // add the CFA include-library paths, which allow direct access to header files without directory qualification
-        args[nargs] = "-I" CFA_INCDIR;
-        nargs += 1;
-        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";
-        nargs += 1;
-
-        #ifdef HAVE_LIBCFA
+        if( !intree ) {
+                args[nargs] = "-I" CFA_INCDIR;
+                nargs += 1;
+                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";
+                nargs += 1;
+        } else {
+                args[nargs] = "-I" TOP_SRCDIR "libcfa/src";
+                nargs += 1;
+                if ( ! noincstd_flag ) {                                                        // do not use during build
+                        args[nargs] = "-I" TOP_SRCDIR "libcfa/src" "/stdhdr";
+                        nargs += 1;
+                } // if
+                args[nargs] = "-I" TOP_SRCDIR "libcfa/src" "/concurrency";
+                nargs += 1;
+                args[nargs] = "-I" TOP_SRCDIR "libcfa/src" "/containers";
+                nargs += 1;
+        }
+
+        // add stdbool to get defines for bool/true/false
+        args[nargs] = "-imacros";
+        nargs += 1;
+        args[nargs] = "stdbool.h";
+        nargs += 1;
+
+        string libbase;
+        if( !intree ) {
+                libbase = CFA_LIBDIR;
+        } else {
+                libbase = TOP_BUILDDIR "libcfa/";
+                args[nargs] = "-D__CFA_FLAG__=-t";
+                nargs += 1;
+        }
+
+        const char * const arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
+        const char * config = debug ? "debug": "nodebug";
+        string libdir = libbase + arch + "-" + config;
+        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) ) {
+                cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
+                cerr << "Was looking for " << libdir << endl;
+                exit( EXIT_FAILURE );
+        }
+
+        args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir + (intree ? "/prelude" : "")) ).c_str();
+        nargs += 1;
+
         if ( link ) {
-                #if ! defined(HAVE_LIBCFA_RELEASE)
-                if ( ! debug ) {
-                        cerr << "error: Option -nodebug is unavailable, libcfa was not installed." << endl;
-                        exit( EXIT_FAILURE );
-                } // if
-                #endif
-                #if ! defined(HAVE_LIBCFA_DEBUG)
-                if ( debug ) {
-                        cerr << "error: Option -debug is unavailable, libcfa-d was not installed." << endl;
-                        exit( EXIT_FAILURE );
-                } // if
-                #endif
-
                 args[nargs] = "-Xlinker";
                 nargs += 1;
@@ -347 +408 @@
                 args[nargs] = "--undefined=__cfaabi_appready_startup";
                 nargs += 1;
+                args[nargs] = "-Xlinker";
+                nargs += 1;
+                args[nargs] = "--undefined=__cfaabi_dbg_record";
+                nargs += 1;
 
                 // include the cfa library in case it's needed
-                args[nargs] = "-L" CFA_LIBDIR;
-                nargs += 1;
-                if ( debug ) {
-                        args[nargs] = "-lcfa-d";
-                } else {
-                        args[nargs] = "-lcfa";
-                } // if
+                args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src" : "")) ).c_str();
+                nargs += 1;
+                args[nargs] = "-lcfa";
                 nargs += 1;
                 args[nargs] = "-lpthread";
@@ -364 +425 @@
                 nargs += 1;
         } // if
-        #endif // HAVE_LIBCFA
 
         // Add exception flags (unconditionally)
@@ -410 +470 @@
 
         if ( Bprefix.length() == 0 ) {
-                Bprefix = installlibdir;
+                Bprefix = !intree ? installlibdir : srcdriverdir;
                 args[nargs] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str();
                 nargs += 1;
         } // if
 
-    args[nargs] = "-Xlinker";                                                   // used by backtrace
-    nargs += 1;
-    args[nargs] = "-export-dynamic";
-    nargs += 1;
+        args[nargs] = "-Xlinker";                                                       // used by backtrace
+        nargs += 1;
+        args[nargs] = "-export-dynamic";
+        nargs += 1;
 
         // execute the compilation command