Fix arm64 compilation

arm64-gen.c: - Remove VT_NONCONST in load tests/tests2/Makefile: - Fix typo test 127

herman ten brugge committed 4 years ago

Commit 90b68cb1 parent aa9093a2 files · +2 −2Browse files

Unified · Split

2 files

arm64-gen.c +1 −1
tests/tests2/Makefile +1 −1

arm64-gen.c+1−1

@@ -487,7 +487,7 @@ static void arm64_load_cmp(int r, SValue *sv); · 486 unmodified lines
487	ST_FUNC void load(int r, SValue *sv)	487	ST_FUNC void load(int r, SValue *sv)
488	{	488	{
489	int svtt = sv->type.t;	489	int svtt = sv->type.t;
490	int svr = sv->r & ~VT_BOUNDED;	490	int svr = sv->r & ~(VT_BOUNDED \| VT_NONCONST);
491	int svrv = svr & VT_VALMASK;	491	int svrv = svr & VT_VALMASK;
492	uint64_t svcul = (uint32_t)sv->c.i;	492	uint64_t svcul = (uint32_t)sv->c.i;
493	svcul = svcul >> 31 & 1 ? svcul - ((uint64_t)1 << 32) : svcul;	493	svcul = svcul >> 31 & 1 ? svcul - ((uint64_t)1 << 32) : svcul;

tests/tests2/Makefile+1−1

@@ -25,7 +25,7 @@ ifeq (,$(filter i386 x86_64,$(ARCH))) · 24 unmodified lines
25	SKIP += 85_asm-outside-function.test # x86 asm	25	SKIP += 85_asm-outside-function.test # x86 asm
26	SKIP += 124_atomic_counter.test	26	SKIP += 124_atomic_counter.test
27	SKIP += 125_atomic_misc.test # currently only x86 supported	27	SKIP += 125_atomic_misc.test # currently only x86 supported
28	SKIP += 127_asm_goto.text # hardcodes x86 asm	28	SKIP += 127_asm_goto.test # hardcodes x86 asm
29	endif	29	endif
30	ifeq ($(CONFIG_backtrace),no)	30	ifeq ($(CONFIG_backtrace),no)
31	SKIP += 113_btdll.test	31	SKIP += 113_btdll.test