Changeset 6ce3ae9


Ignore:
Timestamp:
Jun 26, 2017, 11:06:15 AM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
c038214
Parents:
74e58ea3
Message:

move builtins to gcc-builtins

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r74e58ea3 r6ce3ae9  
    3232src/prelude/builtins.cf
    3333src/prelude/builtins.c
     34src/prelude/gcc-builtins.cf
     35src/prelude/gcc-builtins.c
    3436src/prelude/extras.cf
    3537src/prelude/bootloader.c
  • src/main.cc

    r74e58ea3 r6ce3ae9  
    186186                if ( ! nopreludep ) {                                                   // include gcc builtins
    187187                        // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
    188                         FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
    189                         assertf( builtins, "cannot open builtins.cf\n" );
    190                         parse( builtins, LinkageSpec::Compiler );
     188                        FILE * gcc_builtins = fopen( libcfap | treep ? "../prelude/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" );
     189                        assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
     190                        parse( gcc_builtins, LinkageSpec::Compiler );
    191191
    192192                        // read the extra prelude in, if not generating the cfa library
  • src/prelude/Makefile.am

    r74e58ea3 r6ce3ae9  
    2020# put into lib for now
    2121cfalibdir = ${CFA_LIBDIR}
    22 cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c
     22cfalib_DATA = gcc-builtins.cf extras.cf prelude.cf bootloader.c
    2323noinst_DATA = ../libcfa/libcfa-prelude.c
    2424
     
    2828
    2929# create forward declarations for gcc builtins
    30 builtins.cf : builtins.c prototypes.sed
     30gcc-builtins.cf : gcc-builtins.c prototypes.sed
    3131        ${AM_V_GEN}@BACKEND_CC@ -E -P $< | sed -f prototypes.sed > $@
    3232
    33 builtins.c : builtins.def prototypes.awk
     33gcc-builtins.c : builtins.def prototypes.awk
    3434        ${AM_V_GEN}@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@
    3535
     
    3838prototypes.awk :
    3939
    40 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
     40../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    4141        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    4242
    43 bootloader.c : bootloader.cf prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
     43bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    4444        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    4545
    46 MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
     46MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
  • src/prelude/Makefile.in

    r74e58ea3 r6ce3ae9  
    211211# put into lib for now
    212212cfalibdir = ${CFA_LIBDIR}
    213 cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c
     213cfalib_DATA = gcc-builtins.cf extras.cf prelude.cf bootloader.c
    214214noinst_DATA = ../libcfa/libcfa-prelude.c
    215 MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
     215MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    216216all: all-am
    217217
     
    425425
    426426# create forward declarations for gcc builtins
    427 builtins.cf : builtins.c prototypes.sed
     427gcc-builtins.cf : gcc-builtins.c prototypes.sed
    428428        ${AM_V_GEN}@BACKEND_CC@ -E -P $< | sed -f prototypes.sed > $@
    429429
    430 builtins.c : builtins.def prototypes.awk
     430gcc-builtins.c : builtins.def prototypes.awk
    431431        ${AM_V_GEN}@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@
    432432
     
    435435prototypes.awk :
    436436
    437 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
     437../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    438438        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    439439
    440 bootloader.c : bootloader.cf prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
     440bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    441441        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    442442
Note: See TracChangeset for help on using the changeset viewer.