aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2019-05-29 10:20:24 +0200
committerDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2019-05-29 10:20:24 +0200
commit6141d184274db971f553130703554f0b1b66ef1b (patch)
tree2bc4838fd347bbc5291d67b1d14a7291aa016bd6
parent98bf785c191457cad09295d053d61eb8633aabd3 (diff)
downloadcompcert-kvx-6141d184274db971f553130703554f0b1b66ef1b.tar.gz
compcert-kvx-6141d184274db971f553130703554f0b1b66ef1b.zip
various fixes
-rwxr-xr-xconfigure2
-rw-r--r--runtime/mppa_k1c/i64_sdiv.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 43c90b47..52fffa63 100755
--- a/configure
+++ b/configure
@@ -461,7 +461,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 __K1C_${osupper}__ -std=c99 -E -include ccomp_k1c_fixes.h"
libmath="-lm"
system="linux"
fi
diff --git a/runtime/mppa_k1c/i64_sdiv.c b/runtime/mppa_k1c/i64_sdiv.c
index d1d268c4..b53294ec 100644
--- a/runtime/mppa_k1c/i64_sdiv.c
+++ b/runtime/mppa_k1c/i64_sdiv.c
@@ -10,6 +10,7 @@
#include <mppa_bare_runtime/k1c/registers.h>
#endif
+#ifdef COMPCERT_FE_EXCEPT
/* DM FIXME this is for floating point */
int fetestexcept(int excepts) {
int mask = (K1_SFR_CS_IO_MASK | K1_SFR_CS_DZ_MASK | K1_SFR_CS_OV_MASK | K1_SFR_CS_UN_MASK | K1_SFR_CS_IN_MASK) & excepts;
@@ -22,3 +23,4 @@ int feclearexcept(int excepts) {
__builtin_k1_wfxl(K1_SFR_CS, mask);
return 0;
}
+#endif