Changeset 6385d62
- Timestamp:
- Jun 26, 2017, 1:05:58 PM (6 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
- Children:
- 16c95e3, fea3faa
- Parents:
- f7b9faf (diff), 807ce84 (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. - Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
.gitignore
rf7b9faf r6385d62 31 31 32 32 src/prelude/builtins.cf 33 src/prelude/builtins.c 33 src/prelude/gcc-builtins.cf 34 src/prelude/gcc-builtins.c 34 35 src/prelude/extras.cf 35 36 src/prelude/bootloader.c -
src/libcfa/Makefile.am
rf7b9faf r6385d62 72 72 libcfa_a_CFLAGS = -nodebug -O2 73 73 libcfa_d_a_SOURCES = ${libsrc} 74 libcfa_d_a_CFLAGS = -debug -O0 74 libcfa_d_a_CFLAGS = -debug -O0 #No need for __CFA_DEBUG__ since we pass -debug 75 75 76 76 stdhdr = ${shell echo stdhdr/*} -
src/libcfa/Makefile.in
rf7b9faf r6385d62 332 332 libcfa_a_CFLAGS = -nodebug -O2 333 333 libcfa_d_a_SOURCES = ${libsrc} 334 libcfa_d_a_CFLAGS = -debug -O0 334 libcfa_d_a_CFLAGS = -debug -O0 #No need for __CFA_DEBUG__ since we pass -debug 335 335 stdhdr = ${shell echo stdhdr/*} 336 336 cfa_includedir = $(CFA_INCDIR) -
src/main.cc
rf7b9faf r6385d62 186 186 if ( ! nopreludep ) { // include gcc builtins 187 187 // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here. 188 // Read to cfa builtins, if not generating the cfa library 188 189 FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" ); 189 190 assertf( builtins, "cannot open builtins.cf\n" ); 190 191 parse( builtins, LinkageSpec::Compiler ); 192 193 // Read to gcc builtins, if not generating the cfa library 194 FILE * gcc_builtins = fopen( libcfap | treep ? "../prelude/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" ); 195 assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" ); 196 parse( gcc_builtins, LinkageSpec::Compiler ); 191 197 192 198 // read the extra prelude in, if not generating the cfa library -
src/prelude/Makefile.am
rf7b9faf r6385d62 20 20 # put into lib for now 21 21 cfalibdir = ${CFA_LIBDIR} 22 cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c22 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c 23 23 noinst_DATA = ../libcfa/libcfa-prelude.c 24 24 … … 28 28 29 29 # create forward declarations for gcc builtins 30 builtins.cf :builtins.c prototypes.sed30 gcc-builtins.cf : gcc-builtins.c prototypes.sed 31 31 ${AM_V_GEN}@BACKEND_CC@ -E -P $< | sed -f prototypes.sed > $@ 32 32 33 builtins.c : builtins.def prototypes.awk33 gcc-builtins.c : builtins.def prototypes.awk 34 34 ${AM_V_GEN}@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ 35 35 … … 38 38 prototypes.awk : 39 39 40 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp 40 # create forward declarations for cfa builtins 41 builtins.cf : builtins.c 42 ${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@} 43 44 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp 41 45 ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@ # use src/cfa-cpp as not in lib until after install 42 46 43 bootloader.c : bootloader.cf prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp47 bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp 44 48 ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@ # use src/cfa-cpp as not in lib until after install 45 49 46 MAINTAINERCLEANFILES = builtins.cbuiltins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}50 MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} -
src/prelude/Makefile.in
rf7b9faf r6385d62 211 211 # put into lib for now 212 212 cfalibdir = ${CFA_LIBDIR} 213 cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c213 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c 214 214 noinst_DATA = ../libcfa/libcfa-prelude.c 215 MAINTAINERCLEANFILES = builtins.cbuiltins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}215 MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} 216 216 all: all-am 217 217 … … 425 425 426 426 # create forward declarations for gcc builtins 427 builtins.cf :builtins.c prototypes.sed427 gcc-builtins.cf : gcc-builtins.c prototypes.sed 428 428 ${AM_V_GEN}@BACKEND_CC@ -E -P $< | sed -f prototypes.sed > $@ 429 429 430 builtins.c : builtins.def prototypes.awk430 gcc-builtins.c : builtins.def prototypes.awk 431 431 ${AM_V_GEN}@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ 432 432 … … 435 435 prototypes.awk : 436 436 437 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp 437 # create forward declarations for cfa builtins 438 builtins.cf : builtins.c 439 ${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@} 440 441 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp 438 442 ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@ # use src/cfa-cpp as not in lib until after install 439 443 440 bootloader.c : bootloader.cf prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp444 bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp 441 445 ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@ # use src/cfa-cpp as not in lib until after install 442 446
Note: See TracChangeset
for help on using the changeset viewer.