From e1c8d92fc6460b9c44b5aef19b2d5e0a74d1e58a Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Wed, 30 Jan 2019 17:17:04 +0100
Subject: remove cruft

---
 test/monniaux/bitsliced-aes/Makefile.ccomp      | 2 +-
 test/monniaux/jpeg-6b/ccomp.sh                  | 2 +-
 test/monniaux/micro-bunzip/Makefile             | 2 +-
 test/monniaux/micro-bunzip/micro-bunzip.c       | 2 +-
 test/monniaux/picosat-965/dm_configure_ccomp.sh | 2 +-
 test/monniaux/uzlib/compile.sh                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'test/monniaux')

diff --git a/test/monniaux/bitsliced-aes/Makefile.ccomp b/test/monniaux/bitsliced-aes/Makefile.ccomp
index 4a64c8bf..84bc3212 100644
--- a/test/monniaux/bitsliced-aes/Makefile.ccomp
+++ b/test/monniaux/bitsliced-aes/Makefile.ccomp
@@ -4,7 +4,7 @@ obj = $(src:.c=.o)
 LDFLAGS = -Wl,--gc-sections
 CFLAGS = -O3 -DUNROLL_TRANSPOSE -D_DEFAULT_SOURCE
 # CC=ccomp
-CC=../../../ccomp -U __SIZEOF_INT128__
+CC=../../../ccomp
 name = bitslice
 
 $(name):  _testbench $(obj)
diff --git a/test/monniaux/jpeg-6b/ccomp.sh b/test/monniaux/jpeg-6b/ccomp.sh
index 3e1ed6b2..45c7923a 100755
--- a/test/monniaux/jpeg-6b/ccomp.sh
+++ b/test/monniaux/jpeg-6b/ccomp.sh
@@ -1 +1 @@
-exec /home/monniaux/work/Kalray/CompCert/ccomp -U __SIZEOF_INT128__ "$@"
+exec /home/monniaux/work/Kalray/CompCert/ccomp "$@"
diff --git a/test/monniaux/micro-bunzip/Makefile b/test/monniaux/micro-bunzip/Makefile
index ccd21360..2f06e4c2 100644
--- a/test/monniaux/micro-bunzip/Makefile
+++ b/test/monniaux/micro-bunzip/Makefile
@@ -9,7 +9,7 @@ micro-bunzip.host: micro-bunzip.c ../clock.c
 	$(CC) $+ -o $@
 
 micro-bunzip.ccomp.k1c: micro-bunzip.c ../clock.gcc.k1c.o
-	../../../ccomp -Wall -O3 $+ -U __SIZEOF_INT128__ -o $@
+	../../../ccomp -Wall -O3 $+ -o $@
 
 # TODO: -O3 buggy??
 micro-bunzip.gcc.k1c: micro-bunzip.c ../clock.gcc.k1c.o
diff --git a/test/monniaux/micro-bunzip/micro-bunzip.c b/test/monniaux/micro-bunzip/micro-bunzip.c
index 33144ba5..532fc7b5 100644
--- a/test/monniaux/micro-bunzip/micro-bunzip.c
+++ b/test/monniaux/micro-bunzip/micro-bunzip.c
@@ -522,6 +522,6 @@ int main(int argc, char *argv[])
   char *c=uncompressStream(0,1);
   extern FILE *fdopen(int fd, const char *mode);
   FILE *err = fdopen(2, "w");
-  fprintf(err, "%s\ncycles=%llu\n", c ? c : "Completed OK", get_total_clock());
+  fprintf(err, "%s\ncycles=%lu\n", c ? c : "Completed OK", get_total_clock());
   return 0;
 }
diff --git a/test/monniaux/picosat-965/dm_configure_ccomp.sh b/test/monniaux/picosat-965/dm_configure_ccomp.sh
index 65498834..457d2856 100755
--- a/test/monniaux/picosat-965/dm_configure_ccomp.sh
+++ b/test/monniaux/picosat-965/dm_configure_ccomp.sh
@@ -1,2 +1,2 @@
 # BUG
-CC=../../../ccomp CFLAGS="-fall -Wall -O3 -U __SIZEOF_INT128__ -DNALARM -DNZIP -DNGETRUSAGE" ./configure.sh
+CC=../../../ccomp CFLAGS="-fall -Wall -O3 -DNALARM -DNZIP -DNGETRUSAGE" ./configure.sh
diff --git a/test/monniaux/uzlib/compile.sh b/test/monniaux/uzlib/compile.sh
index 4c2ffe82..c97ae288 100755
--- a/test/monniaux/uzlib/compile.sh
+++ b/test/monniaux/uzlib/compile.sh
@@ -1 +1 @@
-make CC=/home/monniaux/work/Kalray/CompCert/ccomp COPT="-Wall -O3 -U__SIZEOF_INT128__"
+make CC=/home/monniaux/work/Kalray/CompCert/ccomp COPT="-Wall -O3"
-- 
cgit