Changeset cde3891 for libcfa/prelude


Ignore:
Timestamp:
Jan 23, 2019, 4:52:16 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
a200795
Parents:
9b086ca (diff), 1d832f4 (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' into cleanup-dtors

Location:
libcfa/prelude
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • libcfa/prelude/Makefile.am

    r9b086ca rcde3891  
    1717# create object files in directory with source files
    1818AUTOMAKE_OPTIONS = foreign subdir-objects
     19ACLOCAL_AMFLAGS  = -I automake
    1920
    2021# put into lib for now
    2122cfalibdir = ${CFA_LIBDIR}
    22 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    23 noinst_DATA = ../src/prelude.c
     23cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    2424
    2525CC = @CFACC@
    26 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
     26AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    2727AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    2828
     
    4444        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    4545
    46 prelude.cf : prelude-gen.cc
     46prelude.cfa : prelude-gen.cc
    4747        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    4848        @./prelude-gen > $@
     
    6060include $(DEPDIR)/builtins.Po
    6161
    62 ../src/prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    63         ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    64 
    65 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     62bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    6663        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6764
     
    6966        rm -rf $(DEPDIR)
    7067
    71 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     68MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    7269MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
  • libcfa/prelude/Makefile.in

    r9b086ca rcde3891  
    9090PRE_UNINSTALL = :
    9191POST_UNINSTALL = :
     92build_triplet = @build@
     93host_triplet = @host@
    9294subdir = prelude
    9395ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    94 am__aclocal_m4_deps = $(top_srcdir)/../automake/cfa.m4 \
    95         $(top_srcdir)/configure.ac
     96am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
     97        $(top_srcdir)/automake/ltoptions.m4 \
     98        $(top_srcdir)/automake/ltsugar.m4 \
     99        $(top_srcdir)/automake/ltversion.m4 \
     100        $(top_srcdir)/automake/lt~obsolete.m4 \
     101        $(top_srcdir)/../automake/cfa.m4 $(top_srcdir)/configure.ac
    96102am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    97103        $(ACLOCAL_M4)
     
    147153  }
    148154am__installdirs = "$(DESTDIR)$(cfalibdir)"
    149 DATA = $(cfalib_DATA) $(noinst_DATA)
     155DATA = $(cfalib_DATA)
    150156am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    151157am__DIST_COMMON = $(srcdir)/Makefile.in
     
    154160AMTAR = @AMTAR@
    155161AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     162AR = @AR@
    156163ARCHITECTURE = @ARCHITECTURE@
    157164ARCH_FLAGS = @ARCH_FLAGS@
     
    172179CFA_NAME = @CFA_NAME@
    173180CFA_PREFIX = @CFA_PREFIX@
     181CFA_VERSION = @CFA_VERSION@
    174182CFLAGS = @CFLAGS@
    175183CONFIGURATION = @CONFIGURATION@
     184CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    176185CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    177186CONFIG_CFLAGS = @CONFIG_CFLAGS@
     187CPP = @CPP@
    178188CPPFLAGS = @CPPFLAGS@
    179189CXX = @CXX@
     190CXXCPP = @CXXCPP@
    180191CXXDEPMODE = @CXXDEPMODE@
    181192CXXFLAGS = @CXXFLAGS@
     
    183194DEFS = @DEFS@
    184195DEPDIR = @DEPDIR@
     196DLLTOOL = @DLLTOOL@
    185197DRIVER_DIR = @DRIVER_DIR@
     198DSYMUTIL = @DSYMUTIL@
     199DUMPBIN = @DUMPBIN@
    186200ECHO_C = @ECHO_C@
    187201ECHO_N = @ECHO_N@
    188202ECHO_T = @ECHO_T@
     203EGREP = @EGREP@
    189204EXEEXT = @EXEEXT@
     205FGREP = @FGREP@
     206GREP = @GREP@
    190207INSTALL = @INSTALL@
    191208INSTALL_DATA = @INSTALL_DATA@
     
    193210INSTALL_SCRIPT = @INSTALL_SCRIPT@
    194211INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     212LD = @LD@
    195213LDFLAGS = @LDFLAGS@
    196214LIBOBJS = @LIBOBJS@
    197215LIBS = @LIBS@
     216LIBTOOL = @LIBTOOL@
     217LIPO = @LIPO@
     218LN_S = @LN_S@
    198219LTLIBOBJS = @LTLIBOBJS@
     220LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    199221MAKEINFO = @MAKEINFO@
     222MANIFEST_TOOL = @MANIFEST_TOOL@
    200223MKDIR_P = @MKDIR_P@
     224NM = @NM@
     225NMEDIT = @NMEDIT@
     226OBJDUMP = @OBJDUMP@
    201227OBJEXT = @OBJEXT@
     228OTOOL = @OTOOL@
     229OTOOL64 = @OTOOL64@
    202230PACKAGE = @PACKAGE@
    203231PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    209237PATH_SEPARATOR = @PATH_SEPARATOR@
    210238RANLIB = @RANLIB@
     239SED = @SED@
    211240SET_MAKE = @SET_MAKE@
    212241SHELL = @SHELL@
     
    217246abs_top_builddir = @abs_top_builddir@
    218247abs_top_srcdir = @abs_top_srcdir@
     248ac_ct_AR = @ac_ct_AR@
    219249ac_ct_CC = @ac_ct_CC@
    220250ac_ct_CXX = @ac_ct_CXX@
     251ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    221252am__include = @am__include@
    222253am__leading_dot = @am__leading_dot@
     
    225256am__untar = @am__untar@
    226257bindir = @bindir@
     258build = @build@
    227259build_alias = @build_alias@
     260build_cpu = @build_cpu@
     261build_os = @build_os@
     262build_vendor = @build_vendor@
    228263builddir = @builddir@
    229264datadir = @datadir@
     
    232267dvidir = @dvidir@
    233268exec_prefix = @exec_prefix@
     269host = @host@
    234270host_alias = @host_alias@
     271host_cpu = @host_cpu@
     272host_os = @host_os@
     273host_vendor = @host_vendor@
    235274htmldir = @htmldir@
    236275includedir = @includedir@
     
    260299# create object files in directory with source files
    261300AUTOMAKE_OPTIONS = foreign subdir-objects
     301ACLOCAL_AMFLAGS = -I automake
    262302
    263303# put into lib for now
    264304cfalibdir = ${CFA_LIBDIR}
    265 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    266 noinst_DATA = ../src/prelude.c
    267 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
     305cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
     306AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    268307AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    269 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     308MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    270309MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    271310all: all-am
     
    301340        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    302341$(am__aclocal_m4_deps):
     342
     343mostlyclean-libtool:
     344        -rm -f *.lo
     345
     346clean-libtool:
     347        -rm -rf .libs _libs
    303348install-cfalibDATA: $(cfalib_DATA)
    304349        @$(NORMAL_INSTALL)
     
    400445clean: clean-am
    401446
    402 clean-am: clean-generic mostlyclean-am
     447clean-am: clean-generic clean-libtool mostlyclean-am
    403448
    404449distclean: distclean-am
     
    453498mostlyclean: mostlyclean-am
    454499
    455 mostlyclean-am: mostlyclean-generic
     500mostlyclean-am: mostlyclean-generic mostlyclean-libtool
    456501
    457502pdf: pdf-am
     
    467512.MAKE: install-am install-strip
    468513
    469 .PHONY: all all-am check check-am clean clean-generic cscopelist-am \
    470         ctags-am distclean distclean-generic distdir dvi dvi-am html \
    471         html-am info info-am install install-am install-cfalibDATA \
    472         install-data install-data-am install-dvi install-dvi-am \
    473         install-exec install-exec-am install-html install-html-am \
    474         install-info install-info-am install-man install-pdf \
    475         install-pdf-am install-ps install-ps-am install-strip \
    476         installcheck installcheck-am installdirs maintainer-clean \
     514.PHONY: all all-am check check-am clean clean-generic clean-libtool \
     515        cscopelist-am ctags-am distclean distclean-generic \
     516        distclean-libtool distdir dvi dvi-am html html-am info info-am \
     517        install install-am install-cfalibDATA install-data \
     518        install-data-am install-dvi install-dvi-am install-exec \
     519        install-exec-am install-html install-html-am install-info \
     520        install-info-am install-man install-pdf install-pdf-am \
     521        install-ps install-ps-am install-strip installcheck \
     522        installcheck-am installdirs maintainer-clean \
    477523        maintainer-clean-generic maintainer-clean-local mostlyclean \
    478         mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
    479         uninstall-am uninstall-cfalibDATA
     524        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     525        tags-am uninstall uninstall-am uninstall-cfalibDATA
    480526
    481527.PRECIOUS: Makefile
     
    499545        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    500546
    501 prelude.cf : prelude-gen.cc
     547prelude.cfa : prelude-gen.cc
    502548        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    503549        @./prelude-gen > $@
     
    515561include $(DEPDIR)/builtins.Po
    516562
    517 ../src/prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    518         ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    519 
    520 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     563bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    521564        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    522565
  • libcfa/prelude/prelude-gen.cc

    r9b086ca rcde3891  
    142142
    143143int main() {
    144         cout << "# 2 \"prelude.cf\"  // needed for error messages from this file" << endl;
     144        cout << "# 2 \"prelude.cfa\"  // needed for error messages from this file" << endl;
    145145        cout << "trait sized(dtype T) {};" << endl;
    146146
Note: See TracChangeset for help on using the changeset viewer.