Changeset 04c8bba

Timestamp:

Dec 13, 2016, 3:15:11 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

37efaf56

Parents:

58dd019 (diff), 0edebf8 (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 plg2:software/cfa/cfa-cc

Files:

• configure (modified) (5 diffs)
• configure.ac (modified) (3 diffs)
• src/driver/Makefile.am (modified) (1 diff)
• src/driver/Makefile.in (modified) (2 diffs)
• src/driver/cfa.cc (modified) (2 diffs)
• src/libcfa/Makefile.am (modified) (2 diffs)
• src/libcfa/Makefile.in (modified) (7 diffs)

configure

@@ -658 +658 @@
 CFA_INCDIR
 CFA_PREFIX
+BUILD_NO_LIB_FALSE
+BUILD_NO_LIB_TRUE
 BUILD_DEBUG_FALSE
 BUILD_DEBUG_TRUE
@@ -3146 +3148 @@
                                 ;;
                         no)
-                                as_fn_error $? "Must build target debug or release" "$LINENO" 5
-                                exit 1;
+                                build_release="no"
+                                build_debug="no"
                                 ;;
                         *)
@@ -3187 +3189 @@
   BUILD_DEBUG_TRUE='#'
   BUILD_DEBUG_FALSE=
+fi
+
+ if test "x$build_release$build_debug" = "xnono"; then
+  BUILD_NO_LIB_TRUE=
+  BUILD_NO_LIB_FALSE='#'
+else
+  BUILD_NO_LIB_TRUE='#'
+  BUILD_NO_LIB_FALSE=
 fi
 
@@ -6304 +6314 @@
 if test -z "${BUILD_DEBUG_TRUE}" && test -z "${BUILD_DEBUG_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_NO_LIB_TRUE}" && test -z "${BUILD_NO_LIB_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_NO_LIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
@@ -7672 +7686 @@
 fi
 else
+  if test -z "$BUILD_DEBUG_TRUE"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: Building libcfa for target: debug" >&5
 $as_echo "$as_me: Building libcfa for target: debug" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Running cfa without libcfa" >&5
+$as_echo "$as_me: Running cfa without libcfa" >&6;}
+fi
 fi
 

configure.ac

@@ -82 +82 @@
                                 ;;
                         no)
-                                AC_MSG_ERROR(Must build target debug or release)
-                                exit 1;
+                                build_release="no"
+                                build_debug="no"
                                 ;;
                         *)
@@ -111 +111 @@
 AM_CONDITIONAL([BUILD_RELEASE], [test "x$build_release" = "xyes"])
 AM_CONDITIONAL([BUILD_DEBUG], [test "x$build_debug" = "xyes"])
+AM_CONDITIONAL([BUILD_NO_LIB], [test "x$build_release$build_debug" = "xnono"])
 
 if test "x$prefix" = "xNONE"; then
@@ -200 +201 @@
                 [AC_MSG_NOTICE(Building libcfa for target: release & debug)],
                 [AC_MSG_NOTICE(Building libcfa for target: release)])],
-        [AC_MSG_NOTICE(Building libcfa for target: debug)])
+        [AM_COND_IF([BUILD_DEBUG],
+                [AC_MSG_NOTICE(Building libcfa for target: debug)],
+                [AC_MSG_NOTICE(Running cfa without libcfa)])])
 
 # Final text

src/driver/Makefile.am

@@ -17 +17 @@
 # applies to both programs
 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

@@ -38 +38 @@
 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)
@@ -204 +207 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2
+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;
@@ -249 +243 @@
         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

src/libcfa/Makefile.am

@@ -18 +18 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-lib_LIBRARIES = libcfa.a
+lib_LIBRARIES =
+
+if BUILD_RELEASE
+lib_LIBRARIES += libcfa.a
+endif
+
+if BUILD_DEBUG
+lib_LIBRARIES += libcfa-d.a
+endif
 
 # put into lib for now
@@ -78 +86 @@
 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
 
-libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
+libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
+
+libcfa_a_SOURCES = ${libsrc}
+
+libcfa_d_a_SOURCES = ${libsrc}
 
 stdhdr = ${shell echo stdhdr/*}

src/libcfa/Makefile.in

@@ -40 +40 @@
 build_triplet = @build@
 host_triplet = @host@
+@BUILD_RELEASE_TRUE@am__append_1 = libcfa.a
+@BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a
 subdir = src/libcfa
 DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
@@ -89 +91 @@
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
-libcfa_a_AR = $(AR) $(ARFLAGS)
-libcfa_a_LIBADD =
+libcfa_d_a_AR = $(AR) $(ARFLAGS)
+libcfa_d_a_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = limits.$(OBJEXT) stdlib.$(OBJEXT) math.$(OBJEXT) \
@@ -96 +98 @@
         rational.$(OBJEXT) assert.$(OBJEXT) \
         containers/vector.$(OBJEXT) concurrency/threads.$(OBJEXT)
-am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
+am__objects_2 = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
         concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
         concurrency/invoke.$(OBJEXT)
+am_libcfa_d_a_OBJECTS = $(am__objects_2)
+libcfa_d_a_OBJECTS = $(am_libcfa_d_a_OBJECTS)
+libcfa_a_AR = $(AR) $(ARFLAGS)
+libcfa_a_LIBADD =
+am_libcfa_a_OBJECTS = $(am__objects_2)
 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -122 +129 @@
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libcfa_a_SOURCES)
-DIST_SOURCES = $(libcfa_a_SOURCES)
+SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
+DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
 DATA = $(cfalib_DATA)
 HEADERS = $(nobase_include_HEADERS)
@@ -250 +257 @@
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = subdir-objects
-lib_LIBRARIES = libcfa.a
+lib_LIBRARIES = $(am__append_1) $(am__append_2)
 
 # put into lib for now
@@ -268 +275 @@
 runtimehdrs = concurrency
 libobjs = ${headers:=.o}
-libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
+libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
+libcfa_a_SOURCES = ${libsrc}
+libcfa_d_a_SOURCES = ${libsrc}
 stdhdr = ${shell echo stdhdr/*}
 nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
@@ -357 +366 @@
 concurrency/invoke.$(OBJEXT): concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
+libcfa-d.a: $(libcfa_d_a_OBJECTS) $(libcfa_d_a_DEPENDENCIES) $(EXTRA_libcfa_d_a_DEPENDENCIES) 
+        $(AM_V_at)-rm -f libcfa-d.a
+        $(AM_V_AR)$(libcfa_d_a_AR) libcfa-d.a $(libcfa_d_a_OBJECTS) $(libcfa_d_a_LIBADD)
+        $(AM_V_at)$(RANLIB) libcfa-d.a
 libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES) 
         $(AM_V_at)-rm -f libcfa.a