- Timestamp:
- Aug 9, 2018, 1:14:24 PM (5 years ago)
- 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. - Location:
- driver
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
driver/Makefile.am
r7a7ab42 r9aa9126 11 11 ## Created On : Sun May 31 08:49:31 2015 12 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Apr 30 17:44:17201814 ## Update Count : 1 113 ## Last Modified On : Thu Aug 2 12:18:25 2018 14 ## Update Count : 14 15 15 ############################################################################### 16 16 … … 35 35 # put into lib for now 36 36 cc1libdir = ${CFA_LIBDIR} 37 cc1lib_PROGRAMS = cc1 37 cc1lib_PROGRAMS = as cc1 38 as_SOURCES = as.cc 38 39 cc1_SOURCES = cc1.cc 39 40 40 # cfa-cpp$(EXEEXT): $(top_builddir)/driver/cfa-cpp$(EXEEXT)41 # cp $(<) $(@)42 43 41 MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS} -
driver/Makefile.in
r7a7ab42 r9aa9126 93 93 host_triplet = @host@ 94 94 noinst_PROGRAMS = cfa$(EXEEXT) 95 cc1lib_PROGRAMS = cc1$(EXEEXT)95 cc1lib_PROGRAMS = as$(EXEEXT) cc1$(EXEEXT) 96 96 subdir = driver 97 97 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 107 107 am__installdirs = "$(DESTDIR)$(cc1libdir)" 108 108 PROGRAMS = $(cc1lib_PROGRAMS) $(noinst_PROGRAMS) 109 am_as_OBJECTS = as.$(OBJEXT) 110 as_OBJECTS = $(am_as_OBJECTS) 111 as_LDADD = $(LDADD) 109 112 am_cc1_OBJECTS = cc1.$(OBJEXT) 110 113 cc1_OBJECTS = $(am_cc1_OBJECTS) … … 142 145 am__v_CXXLD_0 = @echo " CXXLD " $@; 143 146 am__v_CXXLD_1 = 144 SOURCES = $( cc1_SOURCES) $(cfa_SOURCES)145 DIST_SOURCES = $( cc1_SOURCES) $(cfa_SOURCES)147 SOURCES = $(as_SOURCES) $(cc1_SOURCES) $(cfa_SOURCES) 148 DIST_SOURCES = $(as_SOURCES) $(cc1_SOURCES) $(cfa_SOURCES) 146 149 am__can_run_installinfo = \ 147 150 case $$AM_UPDATE_INFO_DIR in \ … … 302 305 # put into lib for now 303 306 cc1libdir = ${CFA_LIBDIR} 307 as_SOURCES = as.cc 304 308 cc1_SOURCES = cc1.cc 305 306 # cfa-cpp$(EXEEXT): $(top_builddir)/driver/cfa-cpp$(EXEEXT)307 # cp $(<) $(@)308 309 MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS} 309 310 all: all-am … … 386 387 -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) 387 388 389 as$(EXEEXT): $(as_OBJECTS) $(as_DEPENDENCIES) $(EXTRA_as_DEPENDENCIES) 390 @rm -f as$(EXEEXT) 391 $(AM_V_CXXLD)$(CXXLINK) $(as_OBJECTS) $(as_LDADD) $(LIBS) 392 388 393 cc1$(EXEEXT): $(cc1_OBJECTS) $(cc1_DEPENDENCIES) $(EXTRA_cc1_DEPENDENCIES) 389 394 @rm -f cc1$(EXEEXT) … … 400 405 -rm -f *.tab.c 401 406 407 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/as.Po@am__quote@ 402 408 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc1.Po@am__quote@ 403 409 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfa.Po@am__quote@ -
driver/cfa.cc
r7a7ab42 r9aa9126 402 402 args[nargs] = "--undefined=__cfaabi_appready_startup"; 403 403 nargs += 1; 404 args[nargs] = "-Xlinker"; 405 nargs += 1; 406 args[nargs] = "--undefined=__cfaabi_dbg_record"; 407 nargs += 1; 404 408 405 409 // include the cfa library in case it's needed
Note: See TracChangeset
for help on using the changeset viewer.