aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2014-12-17 15:28:01 +0100
committerXavier Leroy <xavier.leroy@inria.fr>2014-12-17 15:28:01 +0100
commit4461db2bd92973b83bbd74c8f2eec16d702cffed (patch)
treeb02c8d646631662a5309238c13306a7d1f3e72db /Makefile
parent20c70573181f81c99ea4e8797615dac8308a9b18 (diff)
parentc1daedb244d1f7586c12749642b0d78ae910e60a (diff)
downloadcompcert-4461db2bd92973b83bbd74c8f2eec16d702cffed.tar.gz
compcert-4461db2bd92973b83bbd74c8f2eec16d702cffed.zip
Merge branch 'master' into pure-makefiles
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 12 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 78d386d6..a515946d 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ COQDEP="$(COQBIN)coqdep" $(COQINCLUDES)
COQDOC="$(COQBIN)coqdoc"
COQEXEC="$(COQBIN)coqtop" $(COQINCLUDES) -batch -load-vernac-source
COQCHK="$(COQBIN)coqchk" $(COQINCLUDES)
+CP=cp
VPATH=$(DIRS)
GPATH=$(DIRS)
@@ -74,6 +75,7 @@ BACKEND=\
ConstpropOp.v Constprop.v ConstpropOpproof.v Constpropproof.v \
CSEdomain.v CombineOp.v CSE.v CombineOpproof.v CSEproof.v \
NeedDomain.v NeedOp.v Deadcode.v Deadcodeproof.v \
+ Unusedglob.v Unusedglobproof.v \
Machregs.v Locations.v Conventions1.v Conventions.v LTL.v \
Allocation.v Allocproof.v \
Tunneling.v Tunnelingproof.v \
@@ -190,16 +192,16 @@ latexdoc:
@chmod -w $*.v
compcert.ini: Makefile.config VERSION
- (echo stdlib_path=$(LIBDIR); \
- echo prepro=$(CPREPRO); \
- echo asm=$(CASM); \
- echo linker=$(CLINKER); \
- echo arch=$(ARCH); \
- echo model=$(MODEL); \
- echo abi=$(ABI); \
- echo system=$(SYSTEM); \
- echo has_runtime_lib=$(HAS_RUNTIME_LIB); \
- echo asm_supports_cfi=$(ASM_SUPPORTS_CFI); \
+ (echo "stdlib_path=$(LIBDIR)"; \
+ echo "prepro=$(CPREPRO)"; \
+ echo "asm=$(CASM)"; \
+ echo "linker=$(CLINKER)"; \
+ echo "arch=$(ARCH)"; \
+ echo "model=$(MODEL)"; \
+ echo "abi=$(ABI)"; \
+ echo "system=$(SYSTEM)"; \
+ echo "has_runtime_lib=$(HAS_RUNTIME_LIB)"; \
+ echo "asm_supports_cfi=$(ASM_SUPPORTS_CFI)"; \
version=`cat VERSION`; \
echo version=$$version) \
> compcert.ini