From a773dca6ddd1bca6b4780ea9387ab96deb001da8 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Mon, 20 Aug 2018 11:22:29 +0200
Subject: Harden the extasm.c test, continued

Follow-up to b9a6a50.  clang is not happy with COMPCERT_MODEL=32sse2
("bad suffix on integer"), so use MODEL_32sse2 and ARCH_x86 instead.
---
 test/regression/Makefile | 2 +-
 test/regression/extasm.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/regression/Makefile b/test/regression/Makefile
index 5d9dda14..d4ef2831 100644
--- a/test/regression/Makefile
+++ b/test/regression/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.config
 CCOMP=../../ccomp
 CCOMPFLAGS=$(CCOMPOPTS) -stdlib ../../runtime \
  -dparse -dc -dclight -dasm -fall \
- -DCOMPCERT_ARCH=$(ARCH) -DCOMPCERT_MODEL=$(MODEL)
+ -DARCH_$(ARCH) -DMODEL_$(MODEL)
 INTERPFLAGS=-stdlib ../../runtime -interp -quiet -fall
 LIBS=$(LIBMATH)
 
diff --git a/test/regression/extasm.c b/test/regression/extasm.c
index 03b03157..babc57f1 100644
--- a/test/regression/extasm.c
+++ b/test/regression/extasm.c
@@ -18,10 +18,10 @@ int clobbers(int x, int z)
   return y + z;
 }
 
-#if (COMPCERT_ARCH==x86 && COMPCERT_MODEL==64) \
- || (COMPCERT_ARCH==riscV && COMPCERT_MODEL==64) \
- || (COMPCERT_ARCH==powerpc && COMPCERT_MODEL==ppc64) \
- || (COMPCERT_ARCH==powerpc && COMPCERT_MODEL==e5500)
+#if (defined(ARCH_x86) && defined(MODEL_64)) \
+ || (defined(ARCH_riscV) && defined(MODEL_64)) \
+ || (defined(ARCH_powerpc) && defined(MODEL_ppc64)) \
+ || (defined(ARCH_powerpc) && defined(MODEL_e5500))
 #define SIXTYFOUR
 #else
 #undef SIXTYFOUR
-- 
cgit