Changeset dfb7c96 for driver

Timestamp:

Aug 23, 2018, 6:28:45 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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

Children:

2a9d12d, bcb14b5

Parents:

9833cae0

Message:

temporary patch to implicitly add -m32 for 32-bit compiles

File:

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

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 23 09:42:47 2018
-// Update Count     : 267
+// Last Modified On : Thu Aug 23 15:41:55 2018
+// Update Count     : 270
 //
 
@@ -343 +343 @@
                 args[nargs] = "-I" CFA_INCDIR;
                 nargs += 1;
-                if ( ! noincstd_flag ) {                                                        // do not use during build
+                if ( ! noincstd_flag ) {                                                // do not use during build
                         args[nargs] = "-I" CFA_INCDIR "stdhdr";
                         nargs += 1;
@@ -354 +354 @@
                 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;
@@ -379 +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();