Changeset 0d78043

Timestamp:

Jun 29, 2017, 1:11:01 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

a49a11b

Parents:

ae47a23 (diff), 8c680e9 (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 plg2:software/cfa/cfa-cc

Location:

src

Files:

• prelude/Makefile.am (modified) (3 diffs)
• prelude/Makefile.in (modified) (4 diffs)
• tests/preempt_longrun/Makefile.am (modified) (1 diff)
• tests/preempt_longrun/Makefile.in (modified) (1 diff)

src/prelude/Makefile.am

@@ -23 +23 @@
 noinst_DATA = ../libcfa/libcfa-prelude.c
 
+$(DEPDIR) :
+        mkdir $(DEPDIR)
+
+$(DEPDIR)/builtins.Po : $(DEPDIR)
+        touch ${@}
+
 # create extra forward types/declarations to reduce inclusion of library files
 extras.cf : extras.regx extras.c
@@ -40 +46 @@
 # create forward declarations for cfa builtins
 builtins.cf : builtins.c
-        ${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@}
+        ${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
+        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
+
+include $(DEPDIR)/builtins.Po
 
 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
@@ -48 +57 @@
         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
+maintainer-clean-local :
+        rm -rf $(DEPDIR)
+
 MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}

src/prelude/Makefile.in

@@ -390 +390 @@
 maintainer-clean: maintainer-clean-am
         -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+        maintainer-clean-local
 
 mostlyclean: mostlyclean-am
@@ -416 +417 @@
         install-ps install-ps-am install-strip installcheck \
         installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-        pdf-am ps ps-am uninstall uninstall-am uninstall-cfalibDATA
-
+        maintainer-clean-generic maintainer-clean-local mostlyclean \
+        mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+        uninstall-cfalibDATA
+
+
+$(DEPDIR) :
+        mkdir $(DEPDIR)
+
+$(DEPDIR)/builtins.Po : $(DEPDIR)
+        touch ${@}
 
 # create extra forward types/declarations to reduce inclusion of library files
@@ -437 +445 @@
 # create forward declarations for cfa builtins
 builtins.cf : builtins.c
-        ${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@}
+        ${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
+        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
+
+include $(DEPDIR)/builtins.Po
 
 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
@@ -444 +455 @@
 bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+
+maintainer-clean-local :
+        rm -rf $(DEPDIR)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/tests/preempt_longrun/Makefile.am

@@ -16 +16 @@
 
 repeats=10
-max_time=10
-N=10ul
+max_time=30
 preempt=10_000ul
 
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
 CFLAGS = ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@

src/tests/preempt_longrun/Makefile.in

@@ -178 +178 @@
 top_srcdir = @top_srcdir@
 repeats = 10
-max_time = 10
-N = 10ul
+max_time = 30
 preempt = 10_000ul
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
 TESTS = barge block create disjoint processor stack wait yield
 all: all-am