Skip to content

Commit 537600d

Browse files
rth7680rth7680
committed
configure: Define TARGET_LONG_BITS in configs/targets/*.mak
Define TARGET_LONG_BITS in each target's configure fragment. Do this without removing the define in target/*/cpu-param.h so that errors are caught like so: In file included from .../src/include/exec/cpu-defs.h:26, from ../src/target/hppa/cpu.h:24, from ../src/linux-user/qemu.h:4, from ../src/linux-user/hppa/cpu_loop.c:21: ../src/target/hppa/cpu-param.h:11: error: "TARGET_LONG_BITS" redefined [-Werror] 11 | #define TARGET_LONG_BITS 64 | In file included from .../src/include/qemu/osdep.h:36, from ../src/linux-user/hppa/cpu_loop.c:20: ./hppa-linux-user-config-target.h:32: note: this is the location of the previous definition 32 | #define TARGET_LONG_BITS 32 | cc1: all warnings being treated as errors Reviewed-by: Thomas Huth <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Richard Henderson <[email protected]>
1 parent 35aae9d commit 537600d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+72
-0
lines changed

‎configs/targets/aarch64-bsd-user.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
TARGET_ARCH=aarch64
22
TARGET_BASE_ARCH=arm
33
TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/aarch64-pauth.xml
4+
TARGET_LONG_BITS=64

‎configs/targets/aarch64-linux-user.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ CONFIG_SEMIHOSTING=y
66
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
77
TARGET_SYSTBL_ABI=common,64,renameat,rlimit,memfd_secret
88
TARGET_SYSTBL=syscall_64.tbl
9+
TARGET_LONG_BITS=64

‎configs/targets/aarch64-softmmu.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ TARGET_KVM_HAVE_GUEST_DEBUG=y
55
TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml gdb-xml/aarch64-pauth.xml
66
# needed by boot.c
77
TARGET_NEED_FDT=y
8+
TARGET_LONG_BITS=64

‎configs/targets/aarch64_be-linux-user.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ CONFIG_SEMIHOSTING=y
77
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
88
TARGET_SYSTBL_ABI=common,64,renameat,rlimit,memfd_secret
99
TARGET_SYSTBL=syscall_64.tbl
10+
TARGET_LONG_BITS=64

‎configs/targets/alpha-linux-user.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
TARGET_ARCH=alpha
22
TARGET_SYSTBL_ABI=common
33
TARGET_SYSTBL=syscall.tbl
4+
TARGET_LONG_BITS=64

‎configs/targets/alpha-softmmu.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
TARGET_ARCH=alpha
22
TARGET_SUPPORTS_MTTCG=y
3+
TARGET_LONG_BITS=64

‎configs/targets/arm-bsd-user.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
TARGET_ARCH=arm
22
TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml
3+
TARGET_LONG_BITS=32

‎configs/targets/arm-linux-user.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml
55
TARGET_HAS_BFLT=y
66
CONFIG_SEMIHOSTING=y
77
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
8+
TARGET_LONG_BITS=32

‎configs/targets/arm-softmmu.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ TARGET_SUPPORTS_MTTCG=y
33
TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml
44
# needed by boot.c
55
TARGET_NEED_FDT=y
6+
TARGET_LONG_BITS=32

‎configs/targets/armeb-linux-user.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml
66
TARGET_HAS_BFLT=y
77
CONFIG_SEMIHOSTING=y
88
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
9+
TARGET_LONG_BITS=32

0 commit comments

Comments
 (0)