tests/tcg: add compiler test variables when using containers
Even for container-based cross compilation use $(CROSS_CC_HAS_*) variables. This makes the TCG test makefiles oblivious of whether the compiler is invoked through a container or not. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20220401141326.1244422-10-pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220419091020.3008144-13-alex.bennee@linaro.org>
This commit is contained in:
parent
426045aed8
commit
f084839aba
|
@ -64,7 +64,7 @@ run-memory-replay: memory-replay run-memory-record
|
||||||
|
|
||||||
EXTRA_RUNS+=run-memory-replay
|
EXTRA_RUNS+=run-memory-replay
|
||||||
|
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),)
|
ifneq ($(CROSS_CC_HAS_ARMV8_3),)
|
||||||
pauth-3: CFLAGS += -march=armv8.3-a
|
pauth-3: CFLAGS += -march=armv8.3-a
|
||||||
else
|
else
|
||||||
pauth-3:
|
pauth-3:
|
||||||
|
|
|
@ -18,7 +18,7 @@ run-fcvt: fcvt
|
||||||
$(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref)
|
$(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref)
|
||||||
|
|
||||||
# Pauth Tests
|
# Pauth Tests
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),)
|
ifneq ($(CROSS_CC_HAS_ARMV8_3),)
|
||||||
AARCH64_TESTS += pauth-1 pauth-2 pauth-4 pauth-5
|
AARCH64_TESTS += pauth-1 pauth-2 pauth-4 pauth-5
|
||||||
pauth-%: CFLAGS += -march=armv8.3-a
|
pauth-%: CFLAGS += -march=armv8.3-a
|
||||||
run-pauth-%: QEMU_OPTS += -cpu max
|
run-pauth-%: QEMU_OPTS += -cpu max
|
||||||
|
@ -27,7 +27,7 @@ endif
|
||||||
|
|
||||||
# BTI Tests
|
# BTI Tests
|
||||||
# bti-1 tests the elf notes, so we require special compiler support.
|
# bti-1 tests the elf notes, so we require special compiler support.
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_BTI),)
|
ifneq ($(CROSS_CC_HAS_ARMV8_BTI),)
|
||||||
AARCH64_TESTS += bti-1
|
AARCH64_TESTS += bti-1
|
||||||
bti-1: CFLAGS += -mbranch-protection=standard
|
bti-1: CFLAGS += -mbranch-protection=standard
|
||||||
bti-1: LDFLAGS += -nostdlib
|
bti-1: LDFLAGS += -nostdlib
|
||||||
|
@ -36,12 +36,12 @@ endif
|
||||||
AARCH64_TESTS += bti-2
|
AARCH64_TESTS += bti-2
|
||||||
|
|
||||||
# MTE Tests
|
# MTE Tests
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_MTE),)
|
ifneq ($(CROSS_CC_HAS_ARMV8_MTE),)
|
||||||
AARCH64_TESTS += mte-1 mte-2 mte-3 mte-4 mte-5 mte-6 mte-7
|
AARCH64_TESTS += mte-1 mte-2 mte-3 mte-4 mte-5 mte-6 mte-7
|
||||||
mte-%: CFLAGS += -march=armv8.5-a+memtag
|
mte-%: CFLAGS += -march=armv8.5-a+memtag
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_SVE),)
|
ifneq ($(CROSS_CC_HAS_SVE),)
|
||||||
# System Registers Tests
|
# System Registers Tests
|
||||||
AARCH64_TESTS += sysregs
|
AARCH64_TESTS += sysregs
|
||||||
sysregs: CFLAGS+=-march=armv8.1-a+sve
|
sysregs: CFLAGS+=-march=armv8.1-a+sve
|
||||||
|
@ -88,7 +88,7 @@ EXTRA_RUNS += run-gdbstub-sysregs run-gdbstub-sve-ioctls
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_SVE2),)
|
ifneq ($(CROSS_CC_HAS_SVE2),)
|
||||||
AARCH64_TESTS += test-826
|
AARCH64_TESTS += test-826
|
||||||
test-826: CFLAGS+=-march=armv8.1-a+sve2
|
test-826: CFLAGS+=-march=armv8.1-a+sve2
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -348,6 +348,23 @@ for target in $target_list; do
|
||||||
echo "DOCKER_CROSS_LD_GUEST=$container_cross_ld" >> \
|
echo "DOCKER_CROSS_LD_GUEST=$container_cross_ld" >> \
|
||||||
$config_target_mak
|
$config_target_mak
|
||||||
fi
|
fi
|
||||||
|
case $target in
|
||||||
|
aarch64-*)
|
||||||
|
echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak
|
||||||
|
echo "CROSS_CC_HAS_SVE2=y" >> $config_target_mak
|
||||||
|
echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak
|
||||||
|
echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak
|
||||||
|
echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak
|
||||||
|
;;
|
||||||
|
ppc*)
|
||||||
|
echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak
|
||||||
|
echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak
|
||||||
|
;;
|
||||||
|
i386-linux-user)
|
||||||
|
echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -30,7 +30,7 @@ hello-i386: LDFLAGS+=-nostdlib
|
||||||
# test-386 includes a couple of additional objects that need to be
|
# test-386 includes a couple of additional objects that need to be
|
||||||
# linked together, we also need a no-pie capable compiler due to the
|
# linked together, we also need a no-pie capable compiler due to the
|
||||||
# non-pic calls into 16-bit mode
|
# non-pic calls into 16-bit mode
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_I386_NOPIE),)
|
ifneq ($(CROSS_CC_HAS_I386_NOPIE),)
|
||||||
test-i386: CFLAGS += -fno-pie
|
test-i386: CFLAGS += -fno-pie
|
||||||
|
|
||||||
test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386-shift.h test-i386-muldiv.h
|
test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386-shift.h test-i386-muldiv.h
|
||||||
|
|
|
@ -5,14 +5,14 @@
|
||||||
VPATH += $(SRC_PATH)/tests/tcg/ppc64
|
VPATH += $(SRC_PATH)/tests/tcg/ppc64
|
||||||
VPATH += $(SRC_PATH)/tests/tcg/ppc64le
|
VPATH += $(SRC_PATH)/tests/tcg/ppc64le
|
||||||
|
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER8_VECTOR),)
|
ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),)
|
||||||
PPC64_TESTS=bcdsub non_signalling_xscv
|
PPC64_TESTS=bcdsub non_signalling_xscv
|
||||||
endif
|
endif
|
||||||
$(PPC64_TESTS): CFLAGS += -mpower8-vector
|
$(PPC64_TESTS): CFLAGS += -mpower8-vector
|
||||||
|
|
||||||
PPC64_TESTS += mtfsf
|
PPC64_TESTS += mtfsf
|
||||||
|
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),)
|
ifneq ($(CROSS_CC_HAS_POWER10),)
|
||||||
PPC64_TESTS += byte_reverse sha512-vector
|
PPC64_TESTS += byte_reverse sha512-vector
|
||||||
endif
|
endif
|
||||||
byte_reverse: CFLAGS += -mcpu=power10
|
byte_reverse: CFLAGS += -mcpu=power10
|
||||||
|
|
|
@ -4,12 +4,12 @@
|
||||||
|
|
||||||
VPATH += $(SRC_PATH)/tests/tcg/ppc64le
|
VPATH += $(SRC_PATH)/tests/tcg/ppc64le
|
||||||
|
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER8_VECTOR),)
|
ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),)
|
||||||
PPC64LE_TESTS=bcdsub non_signalling_xscv
|
PPC64LE_TESTS=bcdsub non_signalling_xscv
|
||||||
endif
|
endif
|
||||||
$(PPC64LE_TESTS): CFLAGS += -mpower8-vector
|
$(PPC64LE_TESTS): CFLAGS += -mpower8-vector
|
||||||
|
|
||||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),)
|
ifneq ($(CROSS_CC_HAS_POWER10),)
|
||||||
PPC64LE_TESTS += byte_reverse sha512-vector
|
PPC64LE_TESTS += byte_reverse sha512-vector
|
||||||
endif
|
endif
|
||||||
byte_reverse: CFLAGS += -mcpu=power10
|
byte_reverse: CFLAGS += -mcpu=power10
|
||||||
|
|
Loading…
Reference in New Issue