summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorTaylor Simpson <tsimpson@quicinc.com>2019-11-17 17:14:25 -0600
committerAlex Bennée <alex.bennee@linaro.org>2019-11-20 10:53:31 +0000
commit22c30b2d20e828edadbd992c1d4c4bfd0f3433ba (patch)
treec2030ed5d64fd80067203d4e3fe87fd582dba55d
parent6e98888041db350b9dbd347d885368e3802227d2 (diff)
downloadfocaccia-qemu-22c30b2d20e828edadbd992c1d4c4bfd0f3433ba.tar.gz
focaccia-qemu-22c30b2d20e828edadbd992c1d4c4bfd0f3433ba.zip
tests/tcg: modify multiarch tests to work with clang
Signed-off-by: Taylor Simpson <tsimpson@quicinc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1574032465-12186-1-git-send-email-tsimpson@quicinc.com>
[AJB: tweak header line]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
-rw-r--r--tests/tcg/multiarch/float_helpers.c2
-rw-r--r--tests/tcg/multiarch/linux-test.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/tcg/multiarch/float_helpers.c b/tests/tcg/multiarch/float_helpers.c
index 8ee7903c78..bc530e5732 100644
--- a/tests/tcg/multiarch/float_helpers.c
+++ b/tests/tcg/multiarch/float_helpers.c
@@ -79,11 +79,9 @@ char *fmt_16(uint16_t num)
 
 #ifndef SNANF
 /* Signaling NaN macros, if supported.  */
-# if __GNUC_PREREQ(3, 3)
 #  define SNANF (__builtin_nansf (""))
 #  define SNAN (__builtin_nans (""))
 #  define SNANL (__builtin_nansl (""))
-# endif
 #endif
 
 static float f32_numbers[] = {
diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux-test.c
index 673d7c8a1c..8a7c15cd31 100644
--- a/tests/tcg/multiarch/linux-test.c
+++ b/tests/tcg/multiarch/linux-test.c
@@ -485,7 +485,11 @@ static void test_signal(void)
     act.sa_flags = SA_SIGINFO;
     chk_error(sigaction(SIGSEGV, &act, NULL));
     if (setjmp(jmp_env) == 0) {
-        *(uint8_t *)0 = 0;
+        /*
+         * clang requires volatile or it will turn this into a
+         * call to abort() instead of forcing a SIGSEGV.
+         */
+        *(volatile uint8_t *)0 = 0;
     }
 
     act.sa_handler = SIG_DFL;