Changeset 9aa9126 for driver


Ignore:
Timestamp:
Aug 9, 2018, 1:14:24 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, 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:
3 edited

Legend:

Unmodified
Added
Removed
  • driver/Makefile.am

    r7a7ab42 r9aa9126  
    1111## Created On       : Sun May 31 08:49:31 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Mon Apr 30 17:44:17 2018
    14 ## Update Count     : 11
     13## Last Modified On : Thu Aug  2 12:18:25 2018
     14## Update Count     : 14
    1515###############################################################################
    1616
     
    3535# put into lib for now
    3636cc1libdir = ${CFA_LIBDIR}
    37 cc1lib_PROGRAMS = cc1
     37cc1lib_PROGRAMS = as cc1
     38as_SOURCES = as.cc
    3839cc1_SOURCES = cc1.cc
    3940
    40 # cfa-cpp$(EXEEXT): $(top_builddir)/driver/cfa-cpp$(EXEEXT)
    41 #       cp $(<) $(@)
    42 
    4341MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
  • driver/Makefile.in

    r7a7ab42 r9aa9126  
    9393host_triplet = @host@
    9494noinst_PROGRAMS = cfa$(EXEEXT)
    95 cc1lib_PROGRAMS = cc1$(EXEEXT)
     95cc1lib_PROGRAMS = as$(EXEEXT) cc1$(EXEEXT)
    9696subdir = driver
    9797ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    107107am__installdirs = "$(DESTDIR)$(cc1libdir)"
    108108PROGRAMS = $(cc1lib_PROGRAMS) $(noinst_PROGRAMS)
     109am_as_OBJECTS = as.$(OBJEXT)
     110as_OBJECTS = $(am_as_OBJECTS)
     111as_LDADD = $(LDADD)
    109112am_cc1_OBJECTS = cc1.$(OBJEXT)
    110113cc1_OBJECTS = $(am_cc1_OBJECTS)
     
    142145am__v_CXXLD_0 = @echo "  CXXLD   " $@;
    143146am__v_CXXLD_1 =
    144 SOURCES = $(cc1_SOURCES) $(cfa_SOURCES)
    145 DIST_SOURCES = $(cc1_SOURCES) $(cfa_SOURCES)
     147SOURCES = $(as_SOURCES) $(cc1_SOURCES) $(cfa_SOURCES)
     148DIST_SOURCES = $(as_SOURCES) $(cc1_SOURCES) $(cfa_SOURCES)
    146149am__can_run_installinfo = \
    147150  case $$AM_UPDATE_INFO_DIR in \
     
    302305# put into lib for now
    303306cc1libdir = ${CFA_LIBDIR}
     307as_SOURCES = as.cc
    304308cc1_SOURCES = cc1.cc
    305 
    306 # cfa-cpp$(EXEEXT): $(top_builddir)/driver/cfa-cpp$(EXEEXT)
    307 #       cp $(<) $(@)
    308309MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
    309310all: all-am
     
    386387        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
    387388
     389as$(EXEEXT): $(as_OBJECTS) $(as_DEPENDENCIES) $(EXTRA_as_DEPENDENCIES)
     390        @rm -f as$(EXEEXT)
     391        $(AM_V_CXXLD)$(CXXLINK) $(as_OBJECTS) $(as_LDADD) $(LIBS)
     392
    388393cc1$(EXEEXT): $(cc1_OBJECTS) $(cc1_DEPENDENCIES) $(EXTRA_cc1_DEPENDENCIES)
    389394        @rm -f cc1$(EXEEXT)
     
    400405        -rm -f *.tab.c
    401406
     407@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/as.Po@am__quote@
    402408@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc1.Po@am__quote@
    403409@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfa.Po@am__quote@
  • driver/cfa.cc

    r7a7ab42 r9aa9126  
    402402                args[nargs] = "--undefined=__cfaabi_appready_startup";
    403403                nargs += 1;
     404                args[nargs] = "-Xlinker";
     405                nargs += 1;
     406                args[nargs] = "--undefined=__cfaabi_dbg_record";
     407                nargs += 1;
    404408
    405409                // include the cfa library in case it's needed
Note: See TracChangeset for help on using the changeset viewer.