diff options
author | Sylvain Boulmé <sylvain.boulme@univ-grenoble-alpes.fr> | 2020-06-19 16:33:42 +0200 |
---|---|---|
committer | Sylvain Boulmé <sylvain.boulme@univ-grenoble-alpes.fr> | 2020-06-19 16:33:42 +0200 |
commit | 545e8a9536774528ba11450d234579f371cb0c12 (patch) | |
tree | 3ac86b6edff1e84a68c915a2db9bc07cc6952af2 /configure | |
parent | a5f2505a2f98106dfc4bcbd8efc531abdf70ff76 (diff) | |
parent | 98fd5a5cb11db3d6560d2c9dd41dbdecefc04e0a (diff) | |
download | compcert-kvx-545e8a9536774528ba11450d234579f371cb0c12.tar.gz compcert-kvx-545e8a9536774528ba11450d234579f371cb0c12.zip |
Merge branch 'PseudoAsmblock' into aarch64_block
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 34 |
1 files changed, 17 insertions, 17 deletions
@@ -55,8 +55,8 @@ Supported targets: x86_64-macosx (x86 64 bits, MacOS X) rv32-linux (RISC-V 32 bits, Linux) rv64-linux (RISC-V 64 bits, Linux) - k1c-mbr (Kalray K1c, bare runtime) - k1c-cos (Kalray K1c, ClusterOS) + kvx-mbr (Kalray KVX, bare runtime) + kvx-cos (Kalray KVX, ClusterOS) aarch64-linux (AArch64, i.e. ARMv8 in 64-bit mode, Linux) manual (edit configuration file by hand) @@ -179,8 +179,8 @@ case "$target" in arch="riscV"; model="32"; endianness="little"; bitsize=32;; rv64-*) arch="riscV"; model="64"; endianness="little"; bitsize=64;; - k1c-*) - arch="mppa_k1c"; model="64"; endianness="little"; bitsize=64;; + kvx-*) + arch="kvx"; model="64"; endianness="little"; bitsize=64;; aarch64-*|arm64-*) arch="aarch64"; model="default"; endianness="little"; bitsize=64;; manual) @@ -437,9 +437,9 @@ if test "$arch" = "riscV"; then fi # -# K1c Target Configuration +# KVX Target Configuration # -if test "$arch" = "mppa_k1c"; then +if test "$arch" = "kvx"; then #model_options="-march=rv64imafd -mabi=lp64d" # FIXME - maybe later add it for NodeOS & cie #model_options=-m64 @@ -452,12 +452,12 @@ if test "$arch" = "mppa_k1c"; then elif test "$target" = "elf"; then os="elf"; else - echo "Unknown K1c backend" + echo "Unknown KVX backend" exit 1 fi osupper=`echo $os|tr a-z A-Z` - k1base="k1-$os" - casm="k1-elf-as" + k1base="kvx-$os" + casm="kvx-elf-as" casm_options="$model_options" cc="$k1base-gcc $model_options" clinker="$k1base-gcc" @@ -465,7 +465,7 @@ if test "$arch" = "mppa_k1c"; then libdir="$HOME/.usr/lib" clinker_options="$model_options -L$libdir -Wl,-rpath=$libdir" cprepro="$k1base-gcc" - cprepro_options="$model_options -D __K1C_${osupper}__ -std=c99 -E -include ccomp_k1c_fixes.h" + cprepro_options="$model_options -D __KVX_${osupper}__ -std=c99 -E -include ccomp_kvx_fixes.h" libmath="-lm" system="linux" fi @@ -568,14 +568,14 @@ missingtools=false echo "Testing Coq... " | tr -d '\n' coq_ver=$(${COQBIN}coqc -v 2>/dev/null | sed -n -e 's/The Coq Proof Assistant, version \([^ ]*\).*$/\1/p') case "$coq_ver" in - 8.8.0|8.8.1|8.8.2|8.9.0|8.9.1|8.10.0|8.10.1|8.10.2|8.11.0|8.11.1) + 8.9.0|8.9.1|8.10.0|8.10.1|8.10.2|8.11.0|8.11.1) echo "version $coq_ver -- good!";; ?*) echo "version $coq_ver -- UNSUPPORTED" if $ignore_coq_version; then echo "Warning: this version of Coq is unsupported, proceed at your own risks." else - echo "Error: CompCert requires one of the following Coq versions: 8.11.0, 8.10.2, 8.10.1, 8.10.0, 8.9.1, 8.9.0, 8.8.2, 8.8.1, 8.8.0" + echo "Error: CompCert requires one of the following Coq versions: 8.11.1, 8.11.0, 8.10.2, 8.10.1, 8.10.0, 8.9.1, 8.9.0" missingtools=true fi;; "") @@ -840,19 +840,19 @@ fi if [ "$arch" = "aarch64" ]; then cat >> Makefile.config <<EOF -ARCHDIRS=$arch mppa_k1c/lib mppa_k1c/abstractbb mppa_k1c/abstractbb/Impure +ARCHDIRS=$arch kvx/lib kvx/abstractbb kvx/abstractbb/Impure BACKENDLIB=Machblock.v Machblockgen.v Machblockgenproof.v OptionMonad.v IterList.v PseudoAsmblock.v PseudoAsmblockproof.v ForwardSimulationBlock.v \\ AbstractBasicBlocksDef.v SeqSimuTheory.v ImpSimuTest.v Parallelizability.v\\ ImpConfig.v ImpCore.v ImpExtern.v ImpHCons.v ImpIO.v ImpLoops.v ImpMonads.v ImpPrelude.v EOF fi -if [ "$arch" = "mppa_k1c" ]; then +if [ "$arch" = "kvx" ]; then cat >> Makefile.config <<EOF ARCHDIRS=$arch $arch/lib $arch/abstractbb $arch/abstractbb/Impure -EXECUTE=k1-cluster --syscall=libstd_scalls.so -- -CFLAGS= -D __K1C_COS__ -SIMU=k1-cluster -- +EXECUTE=kvx-cluster --syscall=libstd_scalls.so -- +CFLAGS= -D __KVX_COS__ +SIMU=kvx-cluster -- BACKENDLIB=Machblock.v Machblockgen.v Machblockgenproof.v OptionMonad.v IterList.v PseudoAsmblock.v PseudoAsmblockproof.v\\ Asmblock.v Asmblockgen.v Asmblockgenproof0.v Asmblockgenproof1.v Asmblockgenproof.v Asmvliw.v Asmblockprops.v\\ ForwardSimulationBlock.v PostpassScheduling.v PostpassSchedulingproof.v\\ |