Changeset d7bcbf5


Ignore:
Timestamp:
Dec 6, 2016, 12:13:49 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
c5cb6130
Parents:
78b3f52
Message:

Added invoke.c to libcfa

Location:
src/libcfa
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.am

    r78b3f52 rd7bcbf5  
    5353         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -c -o $@ $<
    5454
    55 CFLAGS = \
    56         -quiet \
    57         -no-include-stdhdr \
     55EXTRA_FLAGS = \
    5856        -g \
    5957        -Wall \
    6058        -Wno-unused-function \
    6159        @CFA_FLAGS@ \
    62         -B${abs_top_srcdir}/src/driver \
    63         -XCFA \
    64         -t \
    65         -D__CFA_DEBUG__ \
    6660        -I${abs_top_srcdir}/src/libcfa/libhdr \
    6761        # TEMPORARY: does not build with -O2
     62
     63CFLAGS = ${EXTRA_FLAGS} -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver
    6864CC = ${abs_top_srcdir}/src/driver/cfa
    6965
     
    7672        @true
    7773
     74concurrency/invoke.o : concurrency/invoke.c
     75        $(AM_V_CC) @BACKEND_CC@ ${EXTRA_FLAGS} -c -o $@ $<
     76
    7877${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    7978
    80 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S
     79libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S concurrency/invoke.c
    8180
    8281stdhdr = ${shell echo stdhdr/*}
  • src/libcfa/Makefile.in

    r78b3f52 rd7bcbf5  
    9595        containers/vector.$(OBJEXT) concurrency/threads.$(OBJEXT)
    9696am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
    97         concurrency/CtxSwitch-x86_64.$(OBJEXT)
     97        concurrency/CtxSwitch-x86_64.$(OBJEXT) \
     98        concurrency/invoke.$(OBJEXT)
    9899libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    99100DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
     
    146147CFA_LIBDIR = @CFA_LIBDIR@
    147148CFA_PREFIX = @CFA_PREFIX@
    148 CFLAGS = \
    149         -quiet \
    150         -no-include-stdhdr \
    151         -g \
    152         -Wall \
    153         -Wno-unused-function \
    154         @CFA_FLAGS@ \
    155         -B${abs_top_srcdir}/src/driver \
    156         -XCFA \
    157         -t \
    158         -D__CFA_DEBUG__ \
    159         -I${abs_top_srcdir}/src/libcfa/libhdr \
    160         # TEMPORARY: does not build with -O2
    161 
     149CFLAGS = ${EXTRA_FLAGS} -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver
    162150CPP = @CPP@
    163151CPPFLAGS = @CPPFLAGS@
     
    257245cfalib_DATA = builtins.cf extras.cf prelude.cf
    258246MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
     247EXTRA_FLAGS = \
     248        -g \
     249        -Wall \
     250        -Wno-unused-function \
     251        @CFA_FLAGS@ \
     252        -I${abs_top_srcdir}/src/libcfa/libhdr \
     253        # TEMPORARY: does not build with -O2
     254
    259255headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/threads
    260256runtimehdrs = concurrency
    261257libobjs = ${headers:=.o}
    262 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S
     258libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S concurrency/invoke.c
    263259stdhdr = ${shell echo stdhdr/*}
    264260nobase_include_HEADERS = ${headers} ${stdhdr}
     
    346342concurrency/CtxSwitch-x86_64.$(OBJEXT): concurrency/$(am__dirstamp) \
    347343        concurrency/$(DEPDIR)/$(am__dirstamp)
     344concurrency/invoke.$(OBJEXT): concurrency/$(am__dirstamp) \
     345        concurrency/$(DEPDIR)/$(am__dirstamp)
    348346libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES)
    349347        $(AM_V_at)-rm -f libcfa.a
     
    354352        -rm -f *.$(OBJEXT)
    355353        -rm -f concurrency/CtxSwitch-x86_64.$(OBJEXT)
     354        -rm -f concurrency/invoke.$(OBJEXT)
    356355        -rm -f concurrency/threads.$(OBJEXT)
    357356        -rm -f containers/vector.$(OBJEXT)
     
    370369@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
    371370@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-x86_64.Po@am__quote@
     371@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Po@am__quote@
    372372@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/threads.Po@am__quote@
    373373@AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/vector.Po@am__quote@
     
    689689        @true
    690690
     691concurrency/invoke.o : concurrency/invoke.c
     692        $(AM_V_CC) @BACKEND_CC@ ${EXTRA_FLAGS} -c -o $@ $<
     693
    691694${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    692695
Note: See TracChangeset for help on using the changeset viewer.