Changeset 9aa9126 for driver

Timestamp:

Aug 9, 2018, 1:14:24 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

fc846ae

Parents:

7a7ab42 (diff), 3b2b37f (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:software/cfa/cfa-cc

Location:

driver

Files:

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

driver/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:49:31 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Apr 30 17:44:17 2018
-## Update Count     : 11
+## Last Modified On : Thu Aug  2 12:18:25 2018
+## Update Count     : 14
 ###############################################################################
 
@@ -35 +35 @@
 # put into lib for now
 cc1libdir = ${CFA_LIBDIR}
-cc1lib_PROGRAMS = cc1
+cc1lib_PROGRAMS = as cc1
+as_SOURCES = as.cc
 cc1_SOURCES = cc1.cc
 
-# cfa-cpp$(EXEEXT): $(top_builddir)/driver/cfa-cpp$(EXEEXT)
-#       cp $(<) $(@)
-
 MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}

driver/Makefile.in

@@ -93 +93 @@
 host_triplet = @host@
 noinst_PROGRAMS = cfa$(EXEEXT)
-cc1lib_PROGRAMS = cc1$(EXEEXT)
+cc1lib_PROGRAMS = as$(EXEEXT) cc1$(EXEEXT)
 subdir = driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -107 +107 @@
 am__installdirs = "$(DESTDIR)$(cc1libdir)"
 PROGRAMS = $(cc1lib_PROGRAMS) $(noinst_PROGRAMS)
+am_as_OBJECTS = as.$(OBJEXT)
+as_OBJECTS = $(am_as_OBJECTS)
+as_LDADD = $(LDADD)
 am_cc1_OBJECTS = cc1.$(OBJEXT)
 cc1_OBJECTS = $(am_cc1_OBJECTS)
@@ -142 +145 @@
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(cc1_SOURCES) $(cfa_SOURCES)
-DIST_SOURCES = $(cc1_SOURCES) $(cfa_SOURCES)
+SOURCES = $(as_SOURCES) $(cc1_SOURCES) $(cfa_SOURCES)
+DIST_SOURCES = $(as_SOURCES) $(cc1_SOURCES) $(cfa_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -302 +305 @@
 # put into lib for now
 cc1libdir = ${CFA_LIBDIR}
+as_SOURCES = as.cc
 cc1_SOURCES = cc1.cc
-
-# cfa-cpp$(EXEEXT): $(top_builddir)/driver/cfa-cpp$(EXEEXT)
-#       cp $(<) $(@)
 MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
 all: all-am
@@ -386 +387 @@
         -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 
+as$(EXEEXT): $(as_OBJECTS) $(as_DEPENDENCIES) $(EXTRA_as_DEPENDENCIES) 
+        @rm -f as$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(as_OBJECTS) $(as_LDADD) $(LIBS)
+
 cc1$(EXEEXT): $(cc1_OBJECTS) $(cc1_DEPENDENCIES) $(EXTRA_cc1_DEPENDENCIES) 
         @rm -f cc1$(EXEEXT)
@@ -400 +405 @@
         -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/as.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfa.Po@am__quote@

driver/cfa.cc

@@ -402 +402 @@
                 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