Changeset 1ee048fd

Timestamp:

Aug 13, 2019, 3:25:57 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d65f92c

Parents:

ef46abb

Message:

All tests pass with distributed compilation

Files:

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

driver/cfa.cc

@@ -38 +38 @@
 
 
-bool prefix( string arg, string pre ) {
+bool prefix( const string & arg, const string & pre ) {
         return arg.substr( 0, pre.size() ) == pre;
 } // prefix
 
-bool suffix( string arg ) {
-        enum { NumSuffixes = 3 };
-        static const string suffixes[NumSuffixes] = { "cfa", "hfa", "ifa" };
-        //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;
-        const string * end = suffixes + NumSuffixes;
-        return std::find( suffixes, end, arg.substr( dot + 1 ) ) != end;
+inline bool ends_with(const string & str, const string & sfix) {
+        if (sfix.size() > str.size()) return false;
+        return std::equal(str.rbegin(), str.rbegin() + sfix.size(), sfix.rbegin(), sfix.rend());
+}
+
+bool suffix( const string & arg ) {
+        static const string suffixes[] = { ".cfa", ".hfa", ".cfa.ii" };
+        for(const auto sfix : suffixes) {
+                if(arg.size() <= sfix.size()) continue;
+                size_t pos = arg.find_last_of(sfix);
+                size_t exp = (arg.size() - 1);
+                if(pos == exp) return true;
+        }
+        return false;
 } // suffix
 
@@ -116 +121 @@
         bool m64 = false;                                                                       // -m64 flag
         bool intree = false;
+        bool compiling_libs = false;
         bool disttree = false;
 
@@ -133 +139 @@
 
         // process command-line arguments
-
-        args[nargs] = "-x";                                                                     // turn off language
-        nargs += 1;
-        args[nargs] = "c";
-        nargs += 1;
 
         for ( int i = 1; i < argc; i += 1 ) {
@@ -183 +184 @@
                         } else if ( arg == "-dist-tree" ) {
                                 disttree = true;
+                        } else if ( arg == "-cfalib") {
+                                compiling_libs = true;
                         } else if ( arg == "-compiler" ) {
                                 // use the user specified compiler
@@ -375 +378 @@
         } else {
                 libbase = TOP_BUILDDIR "libcfa/";
+        }
+
+        if( compiling_libs ) {
                 args[nargs] = "-D__CFA_FLAG__=-t";
                 nargs += 1;
@@ -564 +570 @@
         cerr << "args:" << endl;
         for ( int i = 0; args[i] != NULL; i += 1 ) {
-                cerr << " \"" << args[i] << "\"" << endl;
+                cerr << " \"" << args[i] << "\" ";
         } // for
+        cerr << endl;
         #endif // __DEBUG_H__
 

libcfa/prelude/Makefile.am

@@ -72 +72 @@
 distribution: @LOCAL_CFACC@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
         ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
-        echo "Dummy file to track distribution to remote hosts" > ${@}
+        @echo "Dummy file to track distribution to remote hosts" > ${@}
 
 all: all-am distribution

libcfa/prelude/Makefile.in

@@ -572 +572 @@
 @ENABLE_DISTCC_TRUE@distribution: @LOCAL_CFACC@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
 @ENABLE_DISTCC_TRUE@    ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
-@ENABLE_DISTCC_TRUE@    echo "Dummy file to track distribution to remote hosts" > ${@}
+@ENABLE_DISTCC_TRUE@    @echo "Dummy file to track distribution to remote hosts" > ${@}
 
 @ENABLE_DISTCC_TRUE@all: all-am distribution

libcfa/src/Makefile.am

@@ -30 +30 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -cfalib @PRELUDEFLAG@ -I$(srcdir)/stdhdr  @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@

libcfa/src/Makefile.in

@@ -443 +443 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -cfalib @PRELUDEFLAG@ -I$(srcdir)/stdhdr  @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@