Changeset a32346b for libcfa/prelude


Ignore:
Timestamp:
Sep 25, 2018, 4:56:55 PM (7 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
34a6b2e, a332d432
Parents:
48b7085e (diff), 560812b (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 plg2.cs.uwaterloo.ca:software/cfa/cfa-cc

Location:
libcfa/prelude
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • libcfa/prelude/Makefile.am

    r48b7085e ra32346b  
    2020# put into lib for now
    2121cfalibdir = ${CFA_LIBDIR}
    22 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    23 noinst_DATA = ../src/prelude.c
     22cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    2423
    2524CC = @CFACC@
    … …  
    4443        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    4544
    46 prelude.cf : prelude-gen.cc
     45prelude.cfa : prelude-gen.cc
    4746        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    4847        @./prelude-gen > $@
    … …  
    6059include $(DEPDIR)/builtins.Po
    6160
    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@
     61bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    6662        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6763
    … …  
    6965        rm -rf $(DEPDIR)
    7066
    71 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     67MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    7268MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}

  • libcfa/prelude/Makefile.in

    r48b7085e ra32346b  
    147147  }
    148148am__installdirs = "$(DESTDIR)$(cfalibdir)"
    149 DATA = $(cfalib_DATA) $(noinst_DATA)
     149DATA = $(cfalib_DATA)
    150150am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    151151am__DIST_COMMON = $(srcdir)/Makefile.in
    … …  
    174174CFLAGS = @CFLAGS@
    175175CONFIGURATION = @CONFIGURATION@
     176CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    176177CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    177178CONFIG_CFLAGS = @CONFIG_CFLAGS@
    … …  
    263264# put into lib for now
    264265cfalibdir = ${CFA_LIBDIR}
    265 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    266 noinst_DATA = ../src/prelude.c
     266cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    267267AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    268268AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    269 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     269MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    270270MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    271271all: all-am
    … …  
    499499        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    500500
    501 prelude.cf : prelude-gen.cc
     501prelude.cfa : prelude-gen.cc
    502502        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    503503        @./prelude-gen > $@
    … …  
    515515include $(DEPDIR)/builtins.Po
    516516
    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@
     517bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    521518        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    522519

  • libcfa/prelude/prelude-gen.cc

    r48b7085e ra32346b  
    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.