Ignore:
Timestamp:
Jul 1, 2020, 3:15:24 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:
4b84e35
Parents:
df40a56 (diff), 31bb2e1 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/Makefile.in

    rdf40a56 r4ec028d  
    165165am__libcfathread_la_SOURCES_DIST =  \
    166166        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
    167         concurrency/invoke.c concurrency/io.cfa \
     167        concurrency/invoke.c concurrency/io.cfa concurrency/iocall.cfa \
    168168        concurrency/preemption.cfa concurrency/ready_queue.cfa \
    169169        concurrency/stats.cfa concurrency/coroutine.cfa \
     
    176176@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.lo \
    177177@BUILDLIB_TRUE@ concurrency/alarm.lo concurrency/invoke.lo \
    178 @BUILDLIB_TRUE@ concurrency/io.lo concurrency/preemption.lo \
     178@BUILDLIB_TRUE@ concurrency/io.lo concurrency/iocall.lo \
     179@BUILDLIB_TRUE@ concurrency/preemption.lo \
    179180@BUILDLIB_TRUE@ concurrency/ready_queue.lo concurrency/stats.lo \
    180181@BUILDLIB_TRUE@ $(am__objects_3)
     
    484485@BUILDLIB_FALSE@thread_headers =
    485486@BUILDLIB_TRUE@thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
    486 @BUILDLIB_TRUE@thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/io.cfa concurrency/preemption.cfa concurrency/ready_queue.cfa concurrency/stats.cfa ${thread_headers:.hfa=.cfa}
     487@BUILDLIB_TRUE@thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/io.cfa concurrency/iocall.cfa concurrency/preemption.cfa concurrency/ready_queue.cfa concurrency/stats.cfa ${thread_headers:.hfa=.cfa}
    487488
    488489#----------------------------------------------------------------------------------------------------------------
     
    620621        concurrency/$(DEPDIR)/$(am__dirstamp)
    621622concurrency/io.lo: concurrency/$(am__dirstamp) \
     623        concurrency/$(DEPDIR)/$(am__dirstamp)
     624concurrency/iocall.lo: concurrency/$(am__dirstamp) \
    622625        concurrency/$(DEPDIR)/$(am__dirstamp)
    623626concurrency/preemption.lo: concurrency/$(am__dirstamp) \
Note: See TracChangeset for help on using the changeset viewer.