Ignore:
Timestamp:
Jun 10, 2020, 4:19:30 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
ab8a023
Parents:
a5873bd (diff), ee06db5c (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' into relaxed_ready

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/Makefile.in

    ra5873bd r97392b69  
    139139libcfa_la_LIBADD =
    140140am__libcfa_la_SOURCES_DIST = prelude.cfa startup.cfa interpose.cfa \
    141         bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
    142         fstream.cfa iostream.cfa iterator.cfa limits.cfa rational.cfa \
    143         time.cfa stdlib.cfa common.cfa containers/maybe.cfa \
    144         containers/pair.cfa containers/result.cfa \
     141        bits/debug.cfa assert.cfa exception.c virtual.c common.cfa \
     142        fstream.cfa heap.cfa iostream.cfa iterator.cfa limits.cfa \
     143        rational.cfa time.cfa stdlib.cfa memory.cfa \
     144        containers/maybe.cfa containers/pair.cfa containers/result.cfa \
    145145        containers/vector.cfa
    146146am__dirstamp = $(am__leading_dot)dirstamp
    147 @BUILDLIB_TRUE@am__objects_1 = fstream.lo iostream.lo iterator.lo \
    148 @BUILDLIB_TRUE@ limits.lo rational.lo time.lo stdlib.lo \
    149 @BUILDLIB_TRUE@ common.lo containers/maybe.lo \
     147@BUILDLIB_TRUE@am__objects_1 = common.lo fstream.lo heap.lo \
     148@BUILDLIB_TRUE@ iostream.lo iterator.lo limits.lo rational.lo \
     149@BUILDLIB_TRUE@ time.lo stdlib.lo memory.lo containers/maybe.lo \
    150150@BUILDLIB_TRUE@ containers/pair.lo containers/result.lo \
    151151@BUILDLIB_TRUE@ containers/vector.lo
    152152@BUILDLIB_TRUE@am__objects_2 = startup.lo interpose.lo bits/debug.lo \
    153 @BUILDLIB_TRUE@ assert.lo exception.lo virtual.lo heap.lo \
     153@BUILDLIB_TRUE@ assert.lo exception.lo virtual.lo \
    154154@BUILDLIB_TRUE@ $(am__objects_1)
    155155am_libcfa_la_OBJECTS = prelude.lo $(am__objects_2)
     
    237237  esac
    238238am__nobase_cfa_include_HEADERS_DIST = $(shell find $(srcdir)/stdhdr \
    239         -type f -printf "%p ") fstream.hfa iostream.hfa iterator.hfa \
    240         limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    241         containers/maybe.hfa containers/pair.hfa containers/result.hfa \
    242         containers/vector.hfa bitmanip.hfa math.hfa gmp.hfa time_t.hfa \
    243         clock.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa \
     239        -type f -printf "%p ") common.hfa fstream.hfa heap.hfa \
     240        iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa \
     241        stdlib.hfa memory.hfa containers/maybe.hfa containers/pair.hfa \
     242        containers/result.hfa containers/vector.hfa bitmanip.hfa \
     243        exception.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
     244        bits/align.hfa bits/containers.hfa bits/defs.hfa \
    244245        bits/debug.hfa bits/locks.hfa containers/list.hfa \
    245         concurrency/coroutine.hfa concurrency/thread.hfa \
    246         concurrency/kernel.hfa concurrency/monitor.hfa \
    247         concurrency/mutex.hfa concurrency/invoke.h
     246        containers/stackLockFree.hfa concurrency/coroutine.hfa \
     247        concurrency/thread.hfa concurrency/kernel.hfa \
     248        concurrency/monitor.hfa concurrency/mutex.hfa \
     249        concurrency/invoke.h
    248250HEADERS = $(nobase_cfa_include_HEADERS)
    249251am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     
    465467
    466468#----------------------------------------------------------------------------------------------------------------
    467 @BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
    468 @BUILDLIB_TRUE@         bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa
     469@BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa exception.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
     470@BUILDLIB_TRUE@         bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa containers/stackLockFree.hfa
    469471
    470472@BUILDLIB_FALSE@headers =
    471 @BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
     473@BUILDLIB_TRUE@headers = common.hfa fstream.hfa heap.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa \
     474@BUILDLIB_TRUE@         time.hfa stdlib.hfa memory.hfa \
    472475@BUILDLIB_TRUE@         containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
    473476
    474477@BUILDLIB_FALSE@libsrc =
    475 @BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
     478@BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c ${headers:.hfa=.cfa}
    476479@BUILDLIB_FALSE@thread_headers_nosrc =
    477480
Note: See TracChangeset for help on using the changeset viewer.