From 7fcc860e1283667255c592638394cc10bb882302 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 3 Oct 2020 20:06:40 +0100 Subject: Fix Makefile for verilog backend --- Makefile | 7 +++---- _CoqProject | 5 +++-- dune | 3 ++- lib/CompCert | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 2935c7f..24cfefd 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,12 @@ UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Linux) - ARCH := x86_32-linux + ARCH := verilog-linux endif ifeq ($(UNAME_S),Darwin) - ARCH := x86_32-macosx + ARCH := verilog-macosx endif -COMPCERTRECDIRS := lib common x86_32 x86 backend cfrontend driver flocq exportclight \ - MenhirLib cparser +COMPCERTRECDIRS := lib common verilog backend cfrontend driver exportclight cparser COQINCLUDES := -R src/common vericert.common -R src/verilog vericert.verilog \ -R src/extraction vericert.extraction -R src/translation vericert.translation \ diff --git a/_CoqProject b/_CoqProject index e86312b..7d455a5 100644 --- a/_CoqProject +++ b/_CoqProject @@ -13,5 +13,6 @@ -R lib/CompCert/exportclight compcert.exportclight -R lib/CompCert/flocq compcert.flocq -R lib/CompCert/lib compcert.lib --R lib/CompCert/x86 compcert.x86 --R lib/CompCert/x86_32 compcert.x86_32 +-R lib/CompCert/verilog compcert.verilog +-R lib/CompCert/flocq Flocq +-R lib/CompCert/MenhirLib MenhirLib diff --git a/dune b/dune index 92ac822..80eccf1 100644 --- a/dune +++ b/dune @@ -1,5 +1,6 @@ (dirs :standard \ "./lib/CompCert/x86_32" "./lib/CompCert/powerpc" "./lib/CompCert/riscV" - "./lib/CompCert/arm" "./lib/CompCert/aarch64" "./lib/CompCert/extraction") + "./lib/CompCert/arm" "./lib/CompCert/aarch64" "./lib/CompCert/extraction" + "./lib/CompCert/x86" "./lib/CompCert/x86_64") (include_subdirs unqualified) diff --git a/lib/CompCert b/lib/CompCert index dd750a1..92c4cf5 160000 --- a/lib/CompCert +++ b/lib/CompCert @@ -1 +1 @@ -Subproject commit dd750a10840889f73759971a531208278188651e +Subproject commit 92c4cf55ce84dbeeab25f540549d3bb5b099a1f3 -- cgit