diff options
| author | David Monniaux <David.Monniaux@univ-grenoble-alpes.fr> | 2021-10-29 21:56:59 +0200 |
|---|---|---|
| committer | David Monniaux <David.Monniaux@univ-grenoble-alpes.fr> | 2021-10-29 21:56:59 +0200 |
| commit | ae2d228c04f4fca1e281b146764646cbdd7d6b1d (patch) | |
| tree | 244f88aebc77a9ca2ef7e69731deb1dfee434ece /configure | |
| parent | e19d179d1f30d5893e5f30dbd33188350656831e (diff) | |
| parent | d194e47a7d494944385ff61c194693f8a67787cb (diff) | |
| download | compcert-kvx-ae2d228c04f4fca1e281b146764646cbdd7d6b1d.tar.gz compcert-kvx-ae2d228c04f4fca1e281b146764646cbdd7d6b1d.zip | |
Merge remote-tracking branch 'origin/master' into towards_3.10
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -352,7 +352,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) @@ -360,7 +360,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) @@ -369,7 +369,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" ;; @@ -378,7 +378,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" ;; *) @@ -541,19 +541,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 |