Changeset 66f8528 for src/driver

Timestamp:

Dec 15, 2016, 5:16:42 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (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 tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

Location:

src/driver

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (6 diffs)
• cfa.cc (modified) (2 diffs)

src/driver/Makefile.am

@@ -16 +16 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall -O2
+if BUILD_NO_LIB
+else
+AM_CXXFLAGS += -DHAVE_LIBCFA
+endif
+if BUILD_DEBUG
+AM_CXXFLAGS += -DHAVE_LIBCFA_DEBUG
+endif
+if BUILD_RELEASE
+AM_CXXFLAGS += -DHAVE_LIBCFA_RELEASE
+endif
 
 bin_PROGRAMS = cfa

src/driver/Makefile.in

@@ -36 +36 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@BUILD_NO_LIB_FALSE@am__append_1 = -DHAVE_LIBCFA
+@BUILD_DEBUG_TRUE@am__append_2 = -DHAVE_LIBCFA_DEBUG
+@BUILD_RELEASE_TRUE@am__append_3 = -DHAVE_LIBCFA_RELEASE
 bin_PROGRAMS = cfa$(EXEEXT)
 cc1lib_PROGRAMS = cc1$(EXEEXT)
@@ -92 +97 @@
 BACKEND_CC = @BACKEND_CC@
 CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
@@ -126 +134 @@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
+MACHINE_TYPE = @MACHINE_TYPE@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -157 +166 @@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
@@ -164 +177 @@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
@@ -190 +207 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall -O2 $(am__append_1) $(am__append_2) \
+        $(am__append_3)
 cfa_SOURCES = cfa.cc
 

src/driver/cfa.cc

@@ -231 +231 @@
         } // if
 
-        string d;
-        if ( debug ) {
-                d = "-d";
-        } // if
-
         // add the CFA include-library paths, which allow direct access to header files without directory qualification
-
         args[nargs] = "-I" CFA_INCDIR;
         nargs += 1;
@@ -244 +238 @@
                 nargs += 1;
         } // if
+        args[nargs] = "-I" CFA_INCDIR "/concurrency";
+        nargs += 1;
         args[nargs] = "-I" CFA_INCDIR "/containers";
         nargs += 1;
 
+#ifdef HAVE_LIBCFA
         if ( link ) {
+                #if ! defined(HAVE_LIBCFA_RELEASE)
+                        if( !debug ) { 
+                                cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
+                                exit( EXIT_FAILURE );
+                                }
+                #endif
+                #if ! defined(HAVE_LIBCFA_DEBUG)
+                        if( debug ) { 
+                                cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl;
+                                exit( EXIT_FAILURE );
+                                }
+                #endif
+
                 // include the cfa library in case it's needed
                 args[nargs] = "-L" CFA_LIBDIR;
                 nargs += 1;
-                args[nargs] = "-lcfa";
-                nargs += 1;
-        } // if
+                if( debug ) {
+                        args[nargs] = "-lcfa-d";
+                } else {
+                        args[nargs] = "-lcfa";
+                }
+                nargs += 1;
+        } // if
+#endif //HAVE_LIBCFA
 
         // add the correct set of flags based on the type of compile this is