Changeset d93d980 for src


Ignore:
Timestamp:
Oct 27, 2016, 4:15:45 PM (9 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
62e5546
Parents:
25f49f4 (diff), 24eb51ed (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:
src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    r25f49f4 rd93d980  
    4141driver_cfa_cpp_SOURCES = ${SRC}
    4242driver_cfa_cpp_LDADD = ${LEXLIB} -ldl                   # yywrap
    43 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -rdynamic -I${abs_top_srcdir}/src/include
     43driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -Xlinker -export-dynamic -I${abs_top_srcdir}/src/include
    4444
    4545MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}

  • src/Makefile.in

    r25f49f4 rd93d980  
    266266CFA_PREFIX = @CFA_PREFIX@
    267267CFLAGS = @CFLAGS@
     268CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    268269CPP = @CPP@
    269270CPPFLAGS = @CPPFLAGS@
    … …  
    417418driver_cfa_cpp_SOURCES = ${SRC}
    418419driver_cfa_cpp_LDADD = ${LEXLIB} -ldl                   # yywrap
    419 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -rdynamic -I${abs_top_srcdir}/src/include
     420driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -Xlinker -export-dynamic -I${abs_top_srcdir}/src/include
    420421all: $(BUILT_SOURCES)
    421422        $(MAKE) $(AM_MAKEFLAGS) all-am

  • src/driver/Makefile.am

    r25f49f4 rd93d980  
    66## file "LICENCE" distributed with Cforall.
    77##
    8 ## Makefile.am -- 
     8## Makefile.am --
    99##
    1010## Author           : Peter A. Buhr
    … …  
    2626cc1_SOURCES = cc1.cc
    2727
     28cfa.cc : ${abs_top_srcdir}/version
     29        @true
     30
    2831MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}

  • src/driver/Makefile.in

    r25f49f4 rd93d980  
    100100CFA_PREFIX = @CFA_PREFIX@
    101101CFLAGS = @CFLAGS@
     102CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    102103CPP = @CPP@
    103104CPPFLAGS = @CPPFLAGS@
    … …  
    542543
    543544
     545cfa.cc : ${abs_top_srcdir}/version
     546        @true
     547
    544548# Tell versions [3.59,3.63) of GNU make to not export all variables.
    545549# Otherwise a system limit (for SysV at least) may be exceeded.

  • src/driver/cfa.cc

    r25f49f4 rd93d980  
    2525using std::endl;
    2626using std::string;
     27using std::to_string;
    2728
    2829
    … …  
    5051
    5152int main( int argc, char *argv[] ) {
    52         string Version( VERSION );                                                      // current version number from CONFIG
    53         string Major( CFA_VERSION_MAJOR ), Minor( CFA_VERSION_MINOR ), Patch( CFA_VERSION_MINOR );
     53        string Version( CFA_VERSION_LONG );                                                     // current version number from CONFIG
     54        string Major( to_string( CFA_VERSION_MAJOR ) ), Minor( to_string( CFA_VERSION_MINOR ) ), Patch( to_string( CFA_VERSION_PATCH ) );
    5455
    5556        string installincdir( CFA_INCDIR );                                     // fixed location of include files

  • src/examples/Makefile.in

    r25f49f4 rd93d980  
    111111# applies to both programs
    112112CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
     113CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    113114CPP = @CPP@
    114115CPPFLAGS = @CPPFLAGS@

  • src/libcfa/Makefile.in

    r25f49f4 rd93d980  
    137137CFA_PREFIX = @CFA_PREFIX@
    138138CFLAGS = -quiet -no-include-stdhdr -g -Wall -Wno-unused-function @CFA_FLAGS@ -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2
     139CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    139140CPP = @CPP@
    140141CPPFLAGS = @CPPFLAGS@

  • src/tests/Makefile.in

    r25f49f4 rd93d980  
    121121# applies to both programs
    122122CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
     123CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    123124CPP = @CPP@
    124125CPPFLAGS = @CPPFLAGS@
Note: See TracChangeset for help on using the changeset viewer.