Changeset c6bbcdb for libcfa


Ignore:
Timestamp:
Sep 25, 2018, 4:43:25 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
2725882
Parents:
6d44da1
Message:

Fixed shared library version number

Location:
libcfa
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • libcfa/Makefile.in

    r6d44da1 rc6bbcdb  
    236236CFA_NAME = @CFA_NAME@
    237237CFA_PREFIX = @CFA_PREFIX@
     238CFA_VERSION = @CFA_VERSION@
    238239CFLAGS = @CFLAGS@
    239240CONFIGURATION = @CONFIGURATION@

  • libcfa/configure

    r6d44da1 rc6bbcdb  
    709709CFACPP
    710710CFACC
     711CFA_VERSION
    711712DRIVER_DIR
    712713CONFIGURATION
    … …  
    799800CONFIGURATION
    800801DRIVER_DIR
     802CFA_VERSION
    801803CC
    802804CFLAGS
    … …  
    14731475              deubg, nodebug, nolib (prelude-only)
    14741476  DRIVER_DIR  The path to the cforall driver directory
     1477  CFA_VERSION The long version of cfa
    14751478  CC          C compiler command
    14761479  CFLAGS      C compiler flags
    … …  
    29322935
    29332936
     2937
    29342938CFACC=${DRIVER_DIR}cfa
    29352939CFACPP=${DRIVER_DIR}cfa-cpp
     2940
    29362941
    29372942

  • libcfa/configure.ac

    r6d44da1 rc6bbcdb  
    2222AC_ARG_VAR(CONFIGURATION, [The configuration to use when building libcfa, options are: deubg, nodebug, nolib (prelude-only)])
    2323AC_ARG_VAR(DRIVER_DIR, [The path to the cforall driver directory])
     24AC_ARG_VAR(CFA_VERSION, [The long version of cfa])
    2425
    2526CFACC=${DRIVER_DIR}cfa
    … …  
    2728AC_SUBST(CFACC)
    2829AC_SUBST(CFACPP)
     30AC_SUBST(CFA_VERSION)
    2931
    3032#==============================================================================

  • libcfa/prelude/Makefile.in

    r6d44da1 rc6bbcdb  
    179179CFA_NAME = @CFA_NAME@
    180180CFA_PREFIX = @CFA_PREFIX@
     181CFA_VERSION = @CFA_VERSION@
    181182CFLAGS = @CFLAGS@
    182183CONFIGURATION = @CONFIGURATION@
    … …  
    302303# put into lib for now
    303304cfalibdir = ${CFA_LIBDIR}
    304 <<<<<<< HEAD
    305 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    306 noinst_DATA = ../src/prelude.c
     305cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    307306AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    308 =======
    309 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    310 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    311 >>>>>>> master
    312307AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    313308MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa

  • libcfa/src/Makefile.am

    r6d44da1 rc6bbcdb  
    3838#----------------------------------------------------------------------------------------------------------------
    3939if BUILDLIB
     40headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
    4041headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    4142          containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
    4243
    43 headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
    44 
    4544# not all platforms support concurrency, add option do disable it
     45headers_nosrc += concurrency/invoke.h
    4646headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
    4747
    48 headers_nosrc += concurrency/invoke.h
    49 
    50 libobjs = ${headers:.hfa=.lo}
    5148libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
    5249
    … …  
    7774-include $(libdeps)
    7875
    79 prelude.lo : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     76prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    8077        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    8178
     79prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     80        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
     81        @CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    8282
    8383
    8484#----------------------------------------------------------------------------------------------------------------
    8585libcfa_la_SOURCES = prelude.cfa ${libsrc}
     86libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
    8687
    8788stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")

  • libcfa/src/Makefile.in

    r6d44da1 rc6bbcdb  
    135135  }
    136136am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"
    137 <<<<<<< HEAD
    138137LTLIBRARIES = $(lib_LTLIBRARIES)
    139138libcfa_la_LIBADD =
    140 am__dirstamp = $(am__leading_dot)dirstamp
    141 am__objects_1 = fstream.lo iostream.lo iterator.lo limits.lo \
    142         rational.lo time.lo stdlib.lo common.lo containers/maybe.lo \
    143         containers/pair.lo containers/result.lo containers/vector.lo \
    144         concurrency/coroutine.lo concurrency/thread.lo \
    145         concurrency/kernel.lo concurrency/monitor.lo \
    146         concurrency/mutex.lo
    147 am__objects_2 = prelude.lo startup.lo interpose.lo bits/debug.lo \
    148         assert.lo exception.lo virtual.lo heap.lo $(am__objects_1) \
    149         concurrency/CtxSwitch-@ARCHITECTURE@.lo concurrency/alarm.lo \
    150         concurrency/invoke.lo concurrency/preemption.lo
    151 am_libcfa_la_OBJECTS = $(am__objects_2)
    152 libcfa_la_OBJECTS = $(am_libcfa_la_OBJECTS)
    153 AM_V_lt = $(am__v_lt_@AM_V@)
    154 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
    155 am__v_lt_0 = --silent
    156 am__v_lt_1 =
    157 =======
    158 LIBRARIES = $(lib_LIBRARIES)
    159 AR = ar
    160 AM_V_AR = $(am__v_AR_@AM_V@)
    161 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
    162 am__v_AR_0 = @echo "  AR      " $@;
    163 am__v_AR_1 =
    164 libcfa_a_AR = $(AR) $(ARFLAGS)
    165 libcfa_a_LIBADD =
    166 am__libcfa_a_SOURCES_DIST = prelude.cfa startup.cfa interpose.cfa \
     139am__libcfa_la_SOURCES_DIST = prelude.cfa startup.cfa interpose.cfa \
    167140        bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
    168141        fstream.cfa iostream.cfa iterator.cfa limits.cfa rational.cfa \
    … …  
    175148        concurrency/invoke.c concurrency/preemption.cfa
    176149am__dirstamp = $(am__leading_dot)dirstamp
    177 @BUILDLIB_TRUE@am__objects_1 = fstream.$(OBJEXT) iostream.$(OBJEXT) \
    178 @BUILDLIB_TRUE@ iterator.$(OBJEXT) limits.$(OBJEXT) \
    179 @BUILDLIB_TRUE@ rational.$(OBJEXT) time.$(OBJEXT) \
    180 @BUILDLIB_TRUE@ stdlib.$(OBJEXT) common.$(OBJEXT) \
    181 @BUILDLIB_TRUE@ containers/maybe.$(OBJEXT) \
    182 @BUILDLIB_TRUE@ containers/pair.$(OBJEXT) \
    183 @BUILDLIB_TRUE@ containers/result.$(OBJEXT) \
    184 @BUILDLIB_TRUE@ containers/vector.$(OBJEXT) \
    185 @BUILDLIB_TRUE@ concurrency/coroutine.$(OBJEXT) \
    186 @BUILDLIB_TRUE@ concurrency/thread.$(OBJEXT) \
    187 @BUILDLIB_TRUE@ concurrency/kernel.$(OBJEXT) \
    188 @BUILDLIB_TRUE@ concurrency/monitor.$(OBJEXT) \
    189 @BUILDLIB_TRUE@ concurrency/mutex.$(OBJEXT)
    190 @BUILDLIB_TRUE@am__objects_2 = startup.$(OBJEXT) interpose.$(OBJEXT) \
    191 @BUILDLIB_TRUE@ bits/debug.$(OBJEXT) assert.$(OBJEXT) \
    192 @BUILDLIB_TRUE@ exception.$(OBJEXT) virtual.$(OBJEXT) \
    193 @BUILDLIB_TRUE@ heap.$(OBJEXT) $(am__objects_1) \
    194 @BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \
    195 @BUILDLIB_TRUE@ concurrency/alarm.$(OBJEXT) \
    196 @BUILDLIB_TRUE@ concurrency/invoke.$(OBJEXT) \
    197 @BUILDLIB_TRUE@ concurrency/preemption.$(OBJEXT)
    198 am_libcfa_a_OBJECTS = prelude.$(OBJEXT) $(am__objects_2)
    199 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    200 >>>>>>> master
     150@BUILDLIB_TRUE@am__objects_1 = fstream.lo iostream.lo iterator.lo \
     151@BUILDLIB_TRUE@ limits.lo rational.lo time.lo stdlib.lo \
     152@BUILDLIB_TRUE@ common.lo containers/maybe.lo \
     153@BUILDLIB_TRUE@ containers/pair.lo containers/result.lo \
     154@BUILDLIB_TRUE@ containers/vector.lo concurrency/coroutine.lo \
     155@BUILDLIB_TRUE@ concurrency/thread.lo concurrency/kernel.lo \
     156@BUILDLIB_TRUE@ concurrency/monitor.lo concurrency/mutex.lo
     157@BUILDLIB_TRUE@am__objects_2 = startup.lo interpose.lo bits/debug.lo \
     158@BUILDLIB_TRUE@ assert.lo exception.lo virtual.lo heap.lo \
     159@BUILDLIB_TRUE@ $(am__objects_1) \
     160@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.lo \
     161@BUILDLIB_TRUE@ concurrency/alarm.lo concurrency/invoke.lo \
     162@BUILDLIB_TRUE@ concurrency/preemption.lo
     163am_libcfa_la_OBJECTS = prelude.lo $(am__objects_2)
     164libcfa_la_OBJECTS = $(am_libcfa_la_OBJECTS)
     165AM_V_lt = $(am__v_lt_@AM_V@)
     166am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     167am__v_lt_0 = --silent
     168am__v_lt_1 =
     169libcfa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     170        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     171        $(libcfa_la_LDFLAGS) $(LDFLAGS) -o $@
    201172AM_V_P = $(am__v_P_@AM_V@)
    202173am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    … …  
    243214am__v_CCLD_0 = @echo "  CCLD    " $@;
    244215am__v_CCLD_1 =
    245 <<<<<<< HEAD
    246216SOURCES = $(libcfa_la_SOURCES)
    247 DIST_SOURCES = $(libcfa_la_SOURCES)
    248 =======
    249 SOURCES = $(libcfa_a_SOURCES)
    250 DIST_SOURCES = $(am__libcfa_a_SOURCES_DIST)
    251 >>>>>>> master
     217DIST_SOURCES = $(am__libcfa_la_SOURCES_DIST)
    252218am__can_run_installinfo = \
    253219  case $$AM_UPDATE_INFO_DIR in \
    … …  
    255221    *) (install-info --version) >/dev/null 2>&1;; \
    256222  esac
    257 am__nobase_cfa_include_HEADERS_DIST = ${shell find ${srcdir}/stdhdr \
    258         -type f -printf "%p "} fstream.hfa iostream.hfa iterator.hfa \
     223am__nobase_cfa_include_HEADERS_DIST = $(shell find $(srcdir)/stdhdr \
     224        -type f -printf "%p ") fstream.hfa iostream.hfa iterator.hfa \
    259225        limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    260226        containers/maybe.hfa containers/pair.hfa containers/result.hfa \
    … …  
    310276CFA_NAME = @CFA_NAME@
    311277CFA_PREFIX = @CFA_PREFIX@
     278CFA_VERSION = @CFA_VERSION@
    312279CFLAGS = @CFLAGS@
    313280CONFIGURATION = @CONFIGURATION@
    … …  
    429396# create object files in directory with source files
    430397AUTOMAKE_OPTIONS = foreign subdir-objects
    431 <<<<<<< HEAD
    432398ACLOCAL_AMFLAGS = -I automake
    433 =======
    434 >>>>>>> master
    435399ARFLAGS = cr
    436400CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
    … …  
    450414# use -no-include-stdhdr to prevent rebuild cycles
    451415# The built sources must not depend on the installed headers
    452 <<<<<<< HEAD
    453 AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     416AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    454417AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    455 =======
    456 AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    457 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    458 >>>>>>> master
    459418AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
     419@BUILDLIB_FALSE@headers_nosrc =
     420
     421#----------------------------------------------------------------------------------------------------------------
     422
     423# not all platforms support concurrency, add option do disable it
     424@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa \
     425@BUILDLIB_TRUE@ bits/align.hfa bits/containers.hfa \
     426@BUILDLIB_TRUE@ bits/defs.hfa bits/debug.hfa bits/locks.hfa \
     427@BUILDLIB_TRUE@ concurrency/invoke.h
    460428@BUILDLIB_FALSE@headers =
    461 
    462 #----------------------------------------------------------------------------------------------------------------
    463 
    464 # not all platforms support concurrency, add option do disable it
    465 <<<<<<< HEAD
    466 headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa \
    467         rational.hfa time.hfa stdlib.hfa common.hfa \
    468         containers/maybe.hfa containers/pair.hfa containers/result.hfa \
    469         containers/vector.hfa concurrency/coroutine.hfa \
    470         concurrency/thread.hfa concurrency/kernel.hfa \
    471         concurrency/monitor.hfa concurrency/mutex.hfa
    472 libobjs = ${headers:.hfa=.lo}
    473 
    474 # not all platforms support concurrency, add option do disable it
    475 libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
    476         exception.c virtual.c heap.cfa ${headers:.hfa=.cfa} \
    477         concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
    478         concurrency/invoke.c concurrency/preemption.cfa
    479 libcfa_la_SOURCES = ${libsrc}
    480 stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
    481 =======
    482429@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa \
    483430@BUILDLIB_TRUE@ limits.hfa rational.hfa time.hfa stdlib.hfa \
    … …  
    487434@BUILDLIB_TRUE@ concurrency/thread.hfa concurrency/kernel.hfa \
    488435@BUILDLIB_TRUE@ concurrency/monitor.hfa concurrency/mutex.hfa
    489 @BUILDLIB_FALSE@headers_nosrc =
    490 @BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa \
    491 @BUILDLIB_TRUE@ bits/align.hfa bits/containers.hfa \
    492 @BUILDLIB_TRUE@ bits/defs.hfa bits/debug.hfa bits/locks.hfa \
    493 @BUILDLIB_TRUE@ concurrency/invoke.h
    494436@BUILDLIB_FALSE@libsrc =
    495437
    … …  
    507449
    508450# add dependency of cfa files
    509 libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
     451libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(libsrc))))
    510452
    511453# .deps inclusion is not done automatically by automake for new languages
    512454libdeps = $(join \
    513455        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
    514         $(notdir ${libobjs:.o=.Po}) \
     456        $(notdir ${libobjs:.lo=.Po}) \
    515457)
    516458
    517459
    518460#----------------------------------------------------------------------------------------------------------------
    519 libcfa_a_SOURCES = prelude.cfa ${libsrc}
    520 stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
    521 >>>>>>> master
     461libcfa_la_SOURCES = prelude.cfa ${libsrc}
     462libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
     463stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
    522464cfa_includedir = $(CFA_INCDIR)
    523465nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
    … …  
    638580
    639581libcfa.la: $(libcfa_la_OBJECTS) $(libcfa_la_DEPENDENCIES) $(EXTRA_libcfa_la_DEPENDENCIES)
    640         $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libcfa_la_OBJECTS) $(libcfa_la_LIBADD) $(LIBS)
     582        $(AM_V_CCLD)$(libcfa_la_LINK) -rpath $(libdir) $(libcfa_la_OBJECTS) $(libcfa_la_LIBADD) $(LIBS)
    641583
    642584mostlyclean-compile:
    … …  
    652594        -rm -f *.tab.c
    653595
    654 <<<<<<< HEAD
    655596@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Plo@am__quote@
    656 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prelude.Plo@am__quote@
    657597@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Plo@am__quote@
    658598@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@ARCHITECTURE@.Plo@am__quote@
    659599@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Plo@am__quote@
    660 =======
    661 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Po@am__quote@
    662 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Po@am__quote@
    663 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@ARCHITECTURE@.Po@am__quote@
    664 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Po@am__quote@
    665 >>>>>>> master
    666600
    667601.S.o:
    … …  
    969903        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    970904        $(am__mv) $$depbase.Tpo $$depbase.Po
    971 $(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    972 
    973 <<<<<<< HEAD
     905
    974906.cfa.lo:
    975907        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
    976908        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    977909        $(am__mv) $$depbase.Tpo $$depbase.Plo
    978 
    979 #----------------------------------------------------------------------------------------------------------------
    980 # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    981 ${libobjs} : ${cfalib_DATA}
    982 =======
     910$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     911
    983912-include $(libdeps)
    984913
    985914prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    986915        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    987 >>>>>>> master
     916
     917prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     918        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
     919        @CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    988920
    989921#----------------------------------------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.