Changeset b067d9b for driver


Ignore:
Timestamp:
Oct 29, 2019, 4:01:24 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
773db65, 9421f3d8
Parents:
7951100 (diff), 8364209 (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 added
2 moved

Legend:

Unmodified
Added
Removed

  • driver/Makefile.am

    r7951100 rb067d9b  
    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
     17AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     18ACLOCAL_AMFLAGS  = -I automake
     19
    1720# applies to both programs
    18 AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
    19 if BUILD_NO_LIB
    20 else
    21 AM_CXXFLAGS += -DHAVE_LIBCFA
    22 endif
    23 if BUILD_DEBUG
    24 AM_CXXFLAGS += -DHAVE_LIBCFA_DEBUG
    25 endif
    26 if BUILD_RELEASE
    27 AM_CXXFLAGS += -DHAVE_LIBCFA_RELEASE
    28 endif
     21AM_CXXFLAGS = @HOST_FLAGS@ -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src -I${abs_top_srcdir}/src/include
    2922
     23# don't install cfa directly
    3024noinst_PROGRAMS = cfa
    31 cfa_SOURCES = cfa.cc
    3225
     26# use
    3327install-exec-hook:
    3428        @test -z "$(CFA_BINDIR)" || $(MKDIR_P) "$(CFA_BINDIR)"
    … …  
    4034        cd "$(CFA_BINDIR)" && rm -f $(CFA_NAME)
    4135
     36cfa_SOURCES = cfa.cc
     37
    4238# put into lib for now
    4339cc1libdir = ${CFA_LIBDIR}
    44 cc1lib_PROGRAMS = cc1
     40cc1lib_PROGRAMS = as cc1
     41as_SOURCES = as.cc
    4542cc1_SOURCES = cc1.cc
    4643

  • driver/Makefile.in

    r7951100 rb067d9b  
    9292build_triplet = @build@
    9393host_triplet = @host@
    94 @BUILD_NO_LIB_FALSE@am__append_1 = -DHAVE_LIBCFA
    95 @BUILD_DEBUG_TRUE@am__append_2 = -DHAVE_LIBCFA_DEBUG
    96 @BUILD_RELEASE_TRUE@am__append_3 = -DHAVE_LIBCFA_RELEASE
    9794noinst_PROGRAMS = cfa$(EXEEXT)
    98 cc1lib_PROGRAMS = cc1$(EXEEXT)
    99 subdir = src/driver
     95cc1lib_PROGRAMS = as$(EXEEXT) cc1$(EXEEXT)
     96subdir = driver
    10097ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    101 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     98am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
     99        $(top_srcdir)/automake/ltoptions.m4 \
     100        $(top_srcdir)/automake/ltsugar.m4 \
     101        $(top_srcdir)/automake/ltversion.m4 \
     102        $(top_srcdir)/automake/lt~obsolete.m4 \
     103        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
    102104am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    103105        $(ACLOCAL_M4)
    … …  
    109111am__installdirs = "$(DESTDIR)$(cc1libdir)"
    110112PROGRAMS = $(cc1lib_PROGRAMS) $(noinst_PROGRAMS)
     113am_as_OBJECTS = as.$(OBJEXT)
     114as_OBJECTS = $(am_as_OBJECTS)
     115as_LDADD = $(LDADD)
     116AM_V_lt = $(am__v_lt_@AM_V@)
     117am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     118am__v_lt_0 = --silent
     119am__v_lt_1 =
    111120am_cc1_OBJECTS = cc1.$(OBJEXT)
    112121cc1_OBJECTS = $(am_cc1_OBJECTS)
    … …  
    133142CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    134143        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     144LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     145        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
     146        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     147        $(AM_CXXFLAGS) $(CXXFLAGS)
    135148AM_V_CXX = $(am__v_CXX_@AM_V@)
    136149am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
    … …  
    138151am__v_CXX_1 =
    139152CXXLD = $(CXX)
    140 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    141         -o $@
     153CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     154        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
     155        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    142156AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
    143157am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
    144158am__v_CXXLD_0 = @echo "  CXXLD   " $@;
    145159am__v_CXXLD_1 =
    146 SOURCES = $(cc1_SOURCES) $(cfa_SOURCES)
    147 DIST_SOURCES = $(cc1_SOURCES) $(cfa_SOURCES)
     160SOURCES = $(as_SOURCES) $(cc1_SOURCES) $(cfa_SOURCES)
     161DIST_SOURCES = $(as_SOURCES) $(cc1_SOURCES) $(cfa_SOURCES)
    148162am__can_run_installinfo = \
    149163  case $$AM_UPDATE_INFO_DIR in \
    … …  
    173187DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    174188ACLOCAL = @ACLOCAL@
    175 ALLOCA = @ALLOCA@
    176189AMTAR = @AMTAR@
    177190AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     191AR = @AR@
    178192AUTOCONF = @AUTOCONF@
    179193AUTOHEADER = @AUTOHEADER@
    180194AUTOMAKE = @AUTOMAKE@
    181195AWK = @AWK@
    182 BACKEND_CC = @BACKEND_CC@
     196BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    183197CC = @CC@
    184198CCAS = @CCAS@
    … …  
    186200CCASFLAGS = @CCASFLAGS@
    187201CCDEPMODE = @CCDEPMODE@
     202CFACC = @CFACC@
     203CFACC_INSTALL = @CFACC_INSTALL@
     204CFACPP = @CFACPP@
    188205CFA_BACKEND_CC = @CFA_BACKEND_CC@
    189206CFA_BINDIR = @CFA_BINDIR@
    … …  
    197214CPPFLAGS = @CPPFLAGS@
    198215CXX = @CXX@
     216CXXCPP = @CXXCPP@
    199217CXXDEPMODE = @CXXDEPMODE@
    200218CXXFLAGS = @CXXFLAGS@
    201219CYGPATH_W = @CYGPATH_W@
    202220DEFS = @DEFS@
     221DEMANGLER = @DEMANGLER@
    203222DEPDIR = @DEPDIR@
     223DLLTOOL = @DLLTOOL@
     224DRIVER_DIR = @DRIVER_DIR@
     225DSYMUTIL = @DSYMUTIL@
     226DUMPBIN = @DUMPBIN@
    204227ECHO_C = @ECHO_C@
    205228ECHO_N = @ECHO_N@
    … …  
    207230EGREP = @EGREP@
    208231EXEEXT = @EXEEXT@
     232FGREP = @FGREP@
    209233GREP = @GREP@
     234HAS_DISTCC = @HAS_DISTCC@
     235HOST_FLAGS = @HOST_FLAGS@
    210236INSTALL = @INSTALL@
    211237INSTALL_DATA = @INSTALL_DATA@
    … …  
    213239INSTALL_SCRIPT = @INSTALL_SCRIPT@
    214240INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     241LD = @LD@
    215242LDFLAGS = @LDFLAGS@
    216243LEX = @LEX@
    217244LEXLIB = @LEXLIB@
    218245LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     246LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     247LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     248LIBDEMANGLE = @LIBDEMANGLE@
    219249LIBOBJS = @LIBOBJS@
    220250LIBS = @LIBS@
     251LIBTOOL = @LIBTOOL@
     252LIPO = @LIPO@
     253LN_S = @LN_S@
    221254LTLIBOBJS = @LTLIBOBJS@
    222 MACHINE_TYPE = @MACHINE_TYPE@
    223 MAINT = @MAINT@
     255LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    224256MAKEINFO = @MAKEINFO@
     257MANIFEST_TOOL = @MANIFEST_TOOL@
    225258MKDIR_P = @MKDIR_P@
     259NM = @NM@
     260NMEDIT = @NMEDIT@
     261OBJDUMP = @OBJDUMP@
    226262OBJEXT = @OBJEXT@
     263OTOOL = @OTOOL@
     264OTOOL64 = @OTOOL64@
    227265PACKAGE = @PACKAGE@
    228266PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    234272PATH_SEPARATOR = @PATH_SEPARATOR@
    235273RANLIB = @RANLIB@
     274SED = @SED@
    236275SET_MAKE = @SET_MAKE@
    237276SHELL = @SHELL@
    238277STRIP = @STRIP@
     278TARGET_HOSTS = @TARGET_HOSTS@
    239279VERSION = @VERSION@
    240280YACC = @YACC@
    … …  
    244284abs_top_builddir = @abs_top_builddir@
    245285abs_top_srcdir = @abs_top_srcdir@
     286ac_ct_AR = @ac_ct_AR@
    246287ac_ct_CC = @ac_ct_CC@
    247288ac_ct_CXX = @ac_ct_CXX@
     289ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    248290am__include = @am__include@
    249291am__leading_dot = @am__leading_dot@
    … …  
    292334top_builddir = @top_builddir@
    293335top_srcdir = @top_srcdir@
     336AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     337ACLOCAL_AMFLAGS = -I automake
    294338
    295339# applies to both programs
    296 AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src \
    297         $(am__append_1) $(am__append_2) $(am__append_3)
     340AM_CXXFLAGS = @HOST_FLAGS@ -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src -I${abs_top_srcdir}/src/include
    298341cfa_SOURCES = cfa.cc
    299342
    300343# put into lib for now
    301344cc1libdir = ${CFA_LIBDIR}
     345as_SOURCES = as.cc
    302346cc1_SOURCES = cc1.cc
    303347MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
    … …  
    305349
    306350.SUFFIXES:
    307 .SUFFIXES: .cc .o .obj
    308 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
     351.SUFFIXES: .cc .lo .o .obj
     352$(srcdir)/Makefile.in: $(srcdir)/Makefile.am  $(am__configure_deps)
    309353        @for dep in $?; do \
    310354          case '$(am__configure_deps)' in \
    … …  
    315359          esac; \
    316360        done; \
    317         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/driver/Makefile'; \
     361        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign driver/Makefile'; \
    318362        $(am__cd) $(top_srcdir) && \
    319           $(AUTOMAKE) --foreign src/driver/Makefile
     363          $(AUTOMAKE) --foreign driver/Makefile
    320364Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    321365        @case '$?' in \
    … …  
    330374        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    331375
    332 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     376$(top_srcdir)/configure: $(am__configure_deps)
    333377        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    334 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
     378$(ACLOCAL_M4): $(am__aclocal_m4_deps)
    335379        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    336380$(am__aclocal_m4_deps):
    … …  
    345389        sed 's/$(EXEEXT)$$//' | \
    346390        while read p p1; do if test -f $$p \
     391         || test -f $$p1 \
    347392          ; then echo "$$p"; echo "$$p"; else :; fi; \
    348393        done | \
    … …  
    359404            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
    360405            test -z "$$files" || { \
    361               echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(cc1libdir)$$dir'"; \
    362               $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(cc1libdir)$$dir" || exit $$?; \
     406            echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(cc1libdir)$$dir'"; \
     407            $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(cc1libdir)$$dir" || exit $$?; \
    363408            } \
    364409        ; done
    … …  
    376421
    377422clean-cc1libPROGRAMS:
    378         -test -z "$(cc1lib_PROGRAMS)" || rm -f $(cc1lib_PROGRAMS)
     423        @list='$(cc1lib_PROGRAMS)'; test -n "$$list" || exit 0; \
     424        echo " rm -f" $$list; \
     425        rm -f $$list || exit $$?; \
     426        test -n "$(EXEEXT)" || exit 0; \
     427        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
     428        echo " rm -f" $$list; \
     429        rm -f $$list
    379430
    380431clean-noinstPROGRAMS:
    381         -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
     432        @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
     433        echo " rm -f" $$list; \
     434        rm -f $$list || exit $$?; \
     435        test -n "$(EXEEXT)" || exit 0; \
     436        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
     437        echo " rm -f" $$list; \
     438        rm -f $$list
     439
     440as$(EXEEXT): $(as_OBJECTS) $(as_DEPENDENCIES) $(EXTRA_as_DEPENDENCIES)
     441        @rm -f as$(EXEEXT)
     442        $(AM_V_CXXLD)$(CXXLINK) $(as_OBJECTS) $(as_LDADD) $(LIBS)
    382443
    383444cc1$(EXEEXT): $(cc1_OBJECTS) $(cc1_DEPENDENCIES) $(EXTRA_cc1_DEPENDENCIES)
    … …  
    395456        -rm -f *.tab.c
    396457
     458@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/as.Po@am__quote@
    397459@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc1.Po@am__quote@
    398460@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfa.Po@am__quote@
    … …  
    413475@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    414476@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     477
     478.cc.lo:
     479@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     480@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     481@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
     482@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     483@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     484@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
     485
     486mostlyclean-libtool:
     487        -rm -f *.lo
     488
     489clean-libtool:
     490        -rm -rf .libs _libs
    415491
    416492ID: $(am__tagged_files)
    … …  
    536612clean: clean-am
    537613
    538 clean-am: clean-cc1libPROGRAMS clean-generic clean-noinstPROGRAMS \
    539         mostlyclean-am
     614clean-am: clean-cc1libPROGRAMS clean-generic clean-libtool \
     615        clean-noinstPROGRAMS mostlyclean-am
    540616
    541617distclean: distclean-am
    … …  
    593669mostlyclean: mostlyclean-am
    594670
    595 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     671mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     672        mostlyclean-libtool
    596673
    597674pdf: pdf-am
    … …  
    609686
    610687.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
    611         clean-cc1libPROGRAMS clean-generic clean-noinstPROGRAMS \
    612         cscopelist-am ctags ctags-am distclean distclean-compile \
    613         distclean-generic distclean-tags distdir dvi dvi-am html \
    614         html-am info info-am install install-am install-cc1libPROGRAMS \
    615         install-data install-data-am install-dvi install-dvi-am \
    616         install-exec install-exec-am install-exec-hook install-html \
    617         install-html-am install-info install-info-am install-man \
    618         install-pdf install-pdf-am install-ps install-ps-am \
    619         install-strip installcheck installcheck-am installdirs \
    620         maintainer-clean maintainer-clean-generic mostlyclean \
    621         mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
     688        clean-cc1libPROGRAMS clean-generic clean-libtool \
     689        clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
     690        distclean-compile distclean-generic distclean-libtool \
     691        distclean-tags distdir dvi dvi-am html html-am info info-am \
     692        install install-am install-cc1libPROGRAMS install-data \
     693        install-data-am install-dvi install-dvi-am install-exec \
     694        install-exec-am install-exec-hook install-html install-html-am \
     695        install-info install-info-am install-man install-pdf \
     696        install-pdf-am install-ps install-ps-am install-strip \
     697        installcheck installcheck-am installdirs maintainer-clean \
     698        maintainer-clean-generic mostlyclean mostlyclean-compile \
     699        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    622700        tags tags-am uninstall uninstall-am uninstall-cc1libPROGRAMS \
    623701        uninstall-hook
    … …  
    626704
    627705
     706# use
    628707install-exec-hook:
    629708        @test -z "$(CFA_BINDIR)" || $(MKDIR_P) "$(CFA_BINDIR)"
Note: See TracChangeset for help on using the changeset viewer.