From 90b68cbd58305c28776a34ab5d837c0cd9b655c8 Mon Sep 17 00:00:00 2001 From: herman ten brugge Date: Tue, 16 Aug 2022 17:54:42 +0200 Subject: [PATCH] Fix arm64 compilation arm64-gen.c: - Remove VT_NONCONST in load tests/tests2/Makefile: - Fix typo test 127 --- arm64-gen.c | 2 +- tests/tests2/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arm64-gen.c b/arm64-gen.c index 8232f2a9..d35267af 100644 --- a/arm64-gen.c +++ b/arm64-gen.c @@ -487,7 +487,7 @@ static void arm64_load_cmp(int r, SValue *sv); ST_FUNC void load(int r, SValue *sv) { int svtt = sv->type.t; - int svr = sv->r & ~VT_BOUNDED; + int svr = sv->r & ~(VT_BOUNDED | VT_NONCONST); int svrv = svr & VT_VALMASK; uint64_t svcul = (uint32_t)sv->c.i; svcul = svcul >> 31 & 1 ? svcul - ((uint64_t)1 << 32) : svcul; diff --git a/tests/tests2/Makefile b/tests/tests2/Makefile index fbbf0ba5..c0e10c07 100644 --- a/tests/tests2/Makefile +++ b/tests/tests2/Makefile @@ -25,7 +25,7 @@ ifeq (,$(filter i386 x86_64,$(ARCH))) SKIP += 85_asm-outside-function.test # x86 asm SKIP += 124_atomic_counter.test SKIP += 125_atomic_misc.test # currently only x86 supported - SKIP += 127_asm_goto.text # hardcodes x86 asm + SKIP += 127_asm_goto.test # hardcodes x86 asm endif ifeq ($(CONFIG_backtrace),no) SKIP += 113_btdll.test