From af2b004f567e5437904ffa168cf1d79d7b176a00 Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Fri, 1 Oct 2021 11:12:14 +0200 Subject: Add Coq 8.14.0 to the supported versions of Coq --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 10f60262..1b224319 100755 --- a/configure +++ b/configure @@ -504,19 +504,19 @@ 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.9.0|8.9.1|8.10.0|8.10.1|8.10.2|8.11.0|8.11.1|8.11.2|8.12.0|8.12.1|8.12.2|8.13.0|8.13.1|8.13.2) + 8.9.0|8.9.1|8.10.0|8.10.1|8.10.2|8.11.0|8.11.1|8.11.2|8.12.0|8.12.1|8.12.2|8.13.0|8.13.1|8.13.2|8.14.0) 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 a version of Coq between 8.9.0 and 8.13.2" + echo "Error: CompCert requires a version of Coq between 8.9.0 and 8.14.0" missingtools=true fi;; "") echo "NOT FOUND" - echo "Error: make sure Coq version 8.12.2 is installed." + echo "Error: make sure Coq version 8.13.2 is installed." missingtools=true;; esac -- cgit From a420914d237c96d0c5cd3a9055a0338c0d6805d4 Mon Sep 17 00:00:00 2001 From: roconnor-blockstream Date: Sat, 16 Oct 2021 04:21:38 -0400 Subject: Explicitly remove __SIZEOF_INT128__ macro definition. (#419) CompCert does not support 128-bit integers, but the gcc and clang preprocessors do include support as part of its 'built-in'. A common way of testing for 128-bit integer support is to check to see if `__SIZEOF_INT128__` is defined. Eliminating this macro prevents software from believing that 128-bit integers are supported. --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 1b224319..7dfc6e30 100755 --- a/configure +++ b/configure @@ -347,7 +347,7 @@ if test "$arch" = "x86" -a "$bitsize" = "64"; then cc_options="-m64" casm_options="-m64 -c" clinker_options="-m64" - cprepro_options="-std=c99 -m64 -U__GNUC__ -E" + cprepro_options="-std=c99 -m64 -U__GNUC__ -U__SIZEOF_INT128__ -E" system="bsd" ;; linux) @@ -355,7 +355,7 @@ if test "$arch" = "x86" -a "$bitsize" = "64"; then cc_options="-m64" casm_options="-m64 -c" clinker_options="-m64" - cprepro_options="-std=c99 -m64 -U__GNUC__ -E" + cprepro_options="-std=c99 -m64 -U__GNUC__ -U__SIZEOF_INT128__ -E" system="linux" ;; macos|macosx) @@ -364,7 +364,7 @@ if test "$arch" = "x86" -a "$bitsize" = "64"; then casm_options="-arch x86_64 -c" clinker_options="-arch x86_64" clinker_needs_no_pie=false - cprepro_options="-std=c99 -arch x86_64 -U__GNUC__ -U__clang__ -U__BLOCKS__ '-D__attribute__(x)=' '-D__asm(x)=' '-D_Nullable=' '-D_Nonnull=' '-D__DARWIN_OS_INLINE=static inline' -Wno-\\#warnings -E" + cprepro_options="-std=c99 -arch x86_64 -U__GNUC__ -U__SIZEOF_INT128__ -U__clang__ -U__BLOCKS__ '-D__attribute__(x)=' '-D__asm(x)=' '-D_Nullable=' '-D_Nonnull=' '-D__DARWIN_OS_INLINE=static inline' -Wno-\\#warnings -E" libmath="" system="macos" ;; @@ -373,7 +373,7 @@ if test "$arch" = "x86" -a "$bitsize" = "64"; then cc_options="-m64" casm_options="-m64 -c" clinker_options="-m64" - cprepro_options="-std=c99 -m64 -U__GNUC__ '-D__attribute__(x)=' -E" + cprepro_options="-std=c99 -m64 -U__GNUC__ -U__SIZEOF_INT128__ '-D__attribute__(x)=' -E" system="cygwin" ;; *) -- cgit