Changes in / [9bb81bb8:39f04ec]


Ignore:
Location:
src
Files:
2 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • src/libcfa/Makefile.am

    r9bb81bb8 r39f04ec  
    1111## Created On       : Sun May 31 08:54:01 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Tue Jul  5 16:19:31 2016
    14 ## Update Count     : 178
     13## Last Modified On : Mon Jun 13 14:27:22 2016
     14## Update Count     : 166
    1515###############################################################################
    1616
    … …  
    1919# put into lib for now
    2020cfalibdir = ${libdir}
    21 cfalib_DATA = builtins.cf extras.cf prelude.cf
     21cfalib_DATA = prelude.cf builtins.cf
    2222
    2323# create forward declarations for gcc builtins
    24 extras.cf : extras.regx extras.c
    25         @BACKEND_CC@ -E ${srcdir}/extras.c | grep -f extras.regx > ${srcdir}/extras.cf
     24${libdir}/builtins.cf : ${libdir} ${srcdir}/builtins.cf
     25        ${INSTALL} ${srcdir}/builtins.cf ${libdir}
     26        sed -i -e "s#typedef.*ptrdiff_t.*#`@BACKEND_CC@ -E ${srcdir}/ptrdiff_t.c | grep 'typedef.*ptrdiff_t'`#" ${srcdir}/prelude.cf
    2627
    2728builtins.cf : builtins.c
    28         if [ -e $< ] ; then \
     29        @if [ -e $< ] ; then \
    2930                @BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@ ; \
    3031        fi
    3132
    3233builtins.c : builtins.def prototypes.awk
    33         if [ -e $< ] ; then \
     34        @if [ -e $< ] ; then \
    3435                @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
    3536        fi
    … …  
    3940prototypes.awk :
    4041
    41 MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
     42MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    4243
    4344#--------------------------------------------------
    4445
    45 libcfa-prelude.c : ${srcdir}/prelude.cf ${srcdir}/extras.cf ${srcdir}/builtins.cf
     46libcfa-prelude.c : ${srcdir}/prelude.cf
    4647        ${abs_top_srcdir}/src/driver/cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    4748
    … …  
    6364libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
    6465
    65 nobase_include_HEADERS = ${headers} stdio.h
     66nobase_include_HEADERS = ${headers}
    6667
    6768CLEANFILES = libcfa-prelude.c
    68 
    69 maintainer-clean-local:
    70         -rm -rf ${includedir}/*
     69MAINTAINERCLEANFILES += ${includedir}/*

  • src/libcfa/Makefile.in

    r9bb81bb8 r39f04ec  
    230230# put into lib for now
    231231cfalibdir = ${libdir}
    232 cfalib_DATA = builtins.cf extras.cf prelude.cf
    233 MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
     232cfalib_DATA = prelude.cf builtins.cf
     233MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} \
     234        ${addprefix ${libdir}/,${lib_LIBRARIES}} ${includedir}/*
    234235headers = limits stdlib math iostream fstream iterator rational containers/vector
    235236libobjs = ${headers:=.o}
    236237libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
    237 nobase_include_HEADERS = ${headers} stdio.h
     238nobase_include_HEADERS = ${headers}
    238239CLEANFILES = libcfa-prelude.c
    239240all: all-am
    … …  
    563564        -rm -rf ./$(DEPDIR)
    564565        -rm -f Makefile
    565 maintainer-clean-am: distclean-am maintainer-clean-generic \
    566         maintainer-clean-local
     566maintainer-clean-am: distclean-am maintainer-clean-generic
    567567
    568568mostlyclean: mostlyclean-am
    … …  
    593593        install-ps install-ps-am install-strip installcheck \
    594594        installcheck-am installdirs maintainer-clean \
    595         maintainer-clean-generic maintainer-clean-local mostlyclean \
    596         mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
    597         tags uninstall uninstall-am uninstall-cfalibDATA \
    598         uninstall-libLIBRARIES uninstall-nobase_includeHEADERS
     595        maintainer-clean-generic mostlyclean mostlyclean-compile \
     596        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     597        uninstall-am uninstall-cfalibDATA uninstall-libLIBRARIES \
     598        uninstall-nobase_includeHEADERS
    599599
    600600
    601601# create forward declarations for gcc builtins
    602 extras.cf : extras.regx extras.c
    603         @BACKEND_CC@ -E ${srcdir}/extras.c | grep -f extras.regx > ${srcdir}/extras.cf
     602${libdir}/builtins.cf : ${libdir} ${srcdir}/builtins.cf
     603        ${INSTALL} ${srcdir}/builtins.cf ${libdir}
     604        sed -i -e "s#typedef.*ptrdiff_t.*#`@BACKEND_CC@ -E ${srcdir}/ptrdiff_t.c | grep 'typedef.*ptrdiff_t'`#" ${srcdir}/prelude.cf
    604605
    605606builtins.cf : builtins.c
    606         if [ -e $< ] ; then \
     607        @if [ -e $< ] ; then \
    607608                @BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@ ; \
    608609        fi
    609610
    610611builtins.c : builtins.def prototypes.awk
    611         if [ -e $< ] ; then \
     612        @if [ -e $< ] ; then \
    612613                @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
    613614        fi
    … …  
    619620#--------------------------------------------------
    620621
    621 libcfa-prelude.c : ${srcdir}/prelude.cf ${srcdir}/extras.cf ${srcdir}/builtins.cf
     622libcfa-prelude.c : ${srcdir}/prelude.cf
    622623        ${abs_top_srcdir}/src/driver/cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    623624
    … …  
    631632${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp       # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    632633
    633 maintainer-clean-local:
    634         -rm -rf ${includedir}/*
    635 
    636634# Tell versions [3.59,3.63) of GNU make to not export all variables.
    637635# Otherwise a system limit (for SysV at least) may be exceeded.

  • src/libcfa/stdlib

    r9bb81bb8 r39f04ec  
    1010// Created On       : Thu Jan 28 17:12:35 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Jul  5 09:56:31 2016
    13 // Update Count     : 98
     12// Last Modified On : Thu Jun 30 15:04:18 2016
     13// Update Count     : 97
    1414//
     15
     16//---------------------------------------
     17
     18extern "C" {
     19#include <stddef.h>                                                                             // size_t
     20} // extern "C"
    1521
    1622//---------------------------------------
    … …  
    2127#define EXIT_SUCCESS    0                                                               // successful exit status
    2228#endif // ! EXIT_FAILURE
     29void exit( int rc );
     30void abort( void );
    2331} // extern "C"
    2432

  • src/main.cc

    r9bb81bb8 r39f04ec  
    1010// Created On       : Fri May 15 23:12:02 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Jul  5 15:23:11 2016
    13 // Update Count     : 209
     12// Last Modified On : Sun Jun  5 15:57:30 2016
     13// Update Count     : 205
    1414//
    1515
    … …  
    214214                Parser::get_parser().set_debug( grammarp );
    215215
    216                 // read in the builtins, extras, and the prelude
     216                // read in the builtins and the prelude
    217217                if ( ! nopreludep ) {                                                   // include gcc builtins
    218218                        // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
    … …  
    222222                                exit( EXIT_FAILURE );
    223223                        } // if
     224
    224225                        parse( builtins, LinkageSpec::Compiler );
    225 
    226                         // read the extra prelude in, if not generating the cfa library
    227                         FILE * extras = fopen( libcfap | treep ? "extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
    228                         if ( extras == NULL ) {
    229                                 std::cerr << "Error: can't open extras.cf" << std::endl;
    230                                 exit( EXIT_FAILURE );
    231                         } // if
    232                         parse( extras, LinkageSpec::C );
    233226
    234227                        if ( ! libcfap ) {
Note: See TracChangeset for help on using the changeset viewer.