Changeset e4745d7a for src/libcfa


Ignore:
Timestamp:
Dec 6, 2016, 3:38:11 PM (7 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:
d9c44c3
Parents:
c5cb6130
Message:

Properly fixed the build for i386/x86_64 including regular C file invoke.c and appropriate assembly CtxSwitch?-[CPU].S

Location:
src/libcfa
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • src/libcfa/Makefile.am

    rc5cb6130 re4745d7a  
    6161        # TEMPORARY: does not build with -O2
    6262
     63AM_CCASFLAGS = @CFA_FLAGS@
    6364CFLAGS = ${EXTRA_FLAGS} -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver
    6465CC = ${abs_top_srcdir}/src/driver/cfa
    … …  
    7778${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    7879
    79 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S concurrency/invoke.c
     80libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    8081
    8182stdhdr = ${shell echo stdhdr/*}

  • src/libcfa/Makefile.in

    rc5cb6130 re4745d7a  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
     40build_triplet = @build@
     41host_triplet = @host@
    4042subdir = src/libcfa
    4143DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
    … …  
    9597        containers/vector.$(OBJEXT) concurrency/threads.$(OBJEXT)
    9698am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
    97         concurrency/CtxSwitch-x86_64.$(OBJEXT) \
     99        concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
    98100        concurrency/invoke.$(OBJEXT)
    99101libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    … …  
    174176LIBS = @LIBS@
    175177LTLIBOBJS = @LTLIBOBJS@
     178MACHINE_TYPE = @MACHINE_TYPE@
    176179MAINT = @MAINT@
    177180MAKEINFO = @MAKEINFO@
    … …  
    205208am__untar = @am__untar@
    206209bindir = @bindir@
     210build = @build@
    207211build_alias = @build_alias@
     212build_cpu = @build_cpu@
     213build_os = @build_os@
     214build_vendor = @build_vendor@
    208215builddir = @builddir@
    209216datadir = @datadir@
    … …  
    212219dvidir = @dvidir@
    213220exec_prefix = @exec_prefix@
     221host = @host@
    214222host_alias = @host_alias@
     223host_cpu = @host_cpu@
     224host_os = @host_os@
     225host_vendor = @host_vendor@
    215226htmldir = @htmldir@
    216227includedir = @includedir@
    … …  
    253264        # TEMPORARY: does not build with -O2
    254265
     266AM_CCASFLAGS = @CFA_FLAGS@
    255267headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/threads
    256268runtimehdrs = concurrency
    257269libobjs = ${headers:=.o}
    258 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S concurrency/invoke.c
     270libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    259271stdhdr = ${shell echo stdhdr/*}
    260272nobase_include_HEADERS = ${headers} ${stdhdr}
    … …  
    340352concurrency/threads.$(OBJEXT): concurrency/$(am__dirstamp) \
    341353        concurrency/$(DEPDIR)/$(am__dirstamp)
    342 concurrency/CtxSwitch-x86_64.$(OBJEXT): concurrency/$(am__dirstamp) \
     354concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT):  \
     355        concurrency/$(am__dirstamp) \
    343356        concurrency/$(DEPDIR)/$(am__dirstamp)
    344357concurrency/invoke.$(OBJEXT): concurrency/$(am__dirstamp) \
    … …  
    351364mostlyclean-compile:
    352365        -rm -f *.$(OBJEXT)
    353         -rm -f concurrency/CtxSwitch-x86_64.$(OBJEXT)
     366        -rm -f concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT)
    354367        -rm -f concurrency/invoke.$(OBJEXT)
    355368        -rm -f concurrency/threads.$(OBJEXT)
    … …  
    368381@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
    369382@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
    370 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-x86_64.Po@am__quote@
     383@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@MACHINE_TYPE@.Po@am__quote@
    371384@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Po@am__quote@
    372385@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/threads.Po@am__quote@

  • src/libcfa/concurrency/invoke.c

    rc5cb6130 re4745d7a  
    2828
    2929void __startCoroutine__A0_1_0___this_coroutine__PFP10scoroutine_Pd0___co_main__PF_Pd0___vtable__PFP9scoVtable_Pd0__F_Pd0PF_P9scoVtablePv___1(
    30       struct coroutine *(*this_coroutine)(void * ), 
    31       void (*co_main)(void *), 
    32       struct coVtable *(*get_vtable)(void *), 
    33       void *vthis, 
     30      struct coroutine *(*this_coroutine)(void * ),
     31      void (*co_main)(void *),
     32      struct coVtable *(*get_vtable)(void *),
     33      void *vthis,
    3434      void (*invoke)(struct coVtable *, void *)
    3535) {
    3636
    37       #if ! defined( __x86_64__ )
    38             #error Only __x86_64__ is supported for threads in cfa
     37      #if ! defined( __x86_64__ ) && ! defined( __i386__ )
     38            #error Only __x86_64__ and __i386__ is supported for threads in cfa
    3939      #endif
    4040
Note: See TracChangeset for help on using the changeset viewer.