Changeset d7bcbf5

Timestamp:

Dec 6, 2016, 12:13:49 PM (8 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:

c5cb6130

Parents:

78b3f52

Message:

Added invoke.c to libcfa

Location:

src/libcfa

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (7 diffs)

src/libcfa/Makefile.am

@@ -53 +53 @@
          ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -c -o $@ $<
 
-CFLAGS = \
-        -quiet \
-        -no-include-stdhdr \
+EXTRA_FLAGS = \
         -g \
         -Wall \
         -Wno-unused-function \
         @CFA_FLAGS@ \
-        -B${abs_top_srcdir}/src/driver \
-        -XCFA \
-        -t \
-        -D__CFA_DEBUG__ \
         -I${abs_top_srcdir}/src/libcfa/libhdr \
         # TEMPORARY: does not build with -O2
+
+CFLAGS = ${EXTRA_FLAGS} -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver
 CC = ${abs_top_srcdir}/src/driver/cfa
 
@@ -76 +72 @@
         @true
 
+concurrency/invoke.o : concurrency/invoke.c
+        $(AM_V_CC) @BACKEND_CC@ ${EXTRA_FLAGS} -c -o $@ $<
+
 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
 
-libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S
+libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S concurrency/invoke.c
 
 stdhdr = ${shell echo stdhdr/*}

src/libcfa/Makefile.in

@@ -95 +95 @@
         containers/vector.$(OBJEXT) concurrency/threads.$(OBJEXT)
 am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
-        concurrency/CtxSwitch-x86_64.$(OBJEXT)
+        concurrency/CtxSwitch-x86_64.$(OBJEXT) \
+        concurrency/invoke.$(OBJEXT)
 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -146 +147 @@
 CFA_LIBDIR = @CFA_LIBDIR@
 CFA_PREFIX = @CFA_PREFIX@
-CFLAGS = \
-        -quiet \
-        -no-include-stdhdr \
-        -g \
-        -Wall \
-        -Wno-unused-function \
-        @CFA_FLAGS@ \
-        -B${abs_top_srcdir}/src/driver \
-        -XCFA \
-        -t \
-        -D__CFA_DEBUG__ \
-        -I${abs_top_srcdir}/src/libcfa/libhdr \
-        # TEMPORARY: does not build with -O2
-
+CFLAGS = ${EXTRA_FLAGS} -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -257 +245 @@
 cfalib_DATA = builtins.cf extras.cf prelude.cf
 MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
+EXTRA_FLAGS = \
+        -g \
+        -Wall \
+        -Wno-unused-function \
+        @CFA_FLAGS@ \
+        -I${abs_top_srcdir}/src/libcfa/libhdr \
+        # TEMPORARY: does not build with -O2
+
 headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/threads
 runtimehdrs = concurrency
 libobjs = ${headers:=.o}
-libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S
+libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S concurrency/invoke.c
 stdhdr = ${shell echo stdhdr/*}
 nobase_include_HEADERS = ${headers} ${stdhdr}
@@ -346 +342 @@
 concurrency/CtxSwitch-x86_64.$(OBJEXT): concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
+concurrency/invoke.$(OBJEXT): concurrency/$(am__dirstamp) \
+        concurrency/$(DEPDIR)/$(am__dirstamp)
 libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES) 
         $(AM_V_at)-rm -f libcfa.a
@@ -354 +352 @@
         -rm -f *.$(OBJEXT)
         -rm -f concurrency/CtxSwitch-x86_64.$(OBJEXT)
+        -rm -f concurrency/invoke.$(OBJEXT)
         -rm -f concurrency/threads.$(OBJEXT)
         -rm -f containers/vector.$(OBJEXT)
@@ -370 +369 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-x86_64.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/threads.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/vector.Po@am__quote@
@@ -689 +689 @@
         @true
 
+concurrency/invoke.o : concurrency/invoke.c
+        $(AM_V_CC) @BACKEND_CC@ ${EXTRA_FLAGS} -c -o $@ $<
+
 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator