Browse Source

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 <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Richard Henderson 6 months ago
parent
commit
537600df61
67 changed files with 72 additions and 0 deletions
  1. 1 0
      configs/targets/aarch64-bsd-user.mak
  2. 1 0
      configs/targets/aarch64-linux-user.mak
  3. 1 0
      configs/targets/aarch64-softmmu.mak
  4. 1 0
      configs/targets/aarch64_be-linux-user.mak
  5. 1 0
      configs/targets/alpha-linux-user.mak
  6. 1 0
      configs/targets/alpha-softmmu.mak
  7. 1 0
      configs/targets/arm-bsd-user.mak
  8. 1 0
      configs/targets/arm-linux-user.mak
  9. 1 0
      configs/targets/arm-softmmu.mak
  10. 1 0
      configs/targets/armeb-linux-user.mak
  11. 1 0
      configs/targets/avr-softmmu.mak
  12. 1 0
      configs/targets/hexagon-linux-user.mak
  13. 2 0
      configs/targets/hppa-linux-user.mak
  14. 1 0
      configs/targets/hppa-softmmu.mak
  15. 1 0
      configs/targets/i386-bsd-user.mak
  16. 1 0
      configs/targets/i386-linux-user.mak
  17. 1 0
      configs/targets/i386-softmmu.mak
  18. 1 0
      configs/targets/loongarch64-linux-user.mak
  19. 1 0
      configs/targets/loongarch64-softmmu.mak
  20. 1 0
      configs/targets/m68k-linux-user.mak
  21. 1 0
      configs/targets/m68k-softmmu.mak
  22. 1 0
      configs/targets/microblaze-linux-user.mak
  23. 3 0
      configs/targets/microblaze-softmmu.mak
  24. 1 0
      configs/targets/microblazeel-linux-user.mak
  25. 3 0
      configs/targets/microblazeel-softmmu.mak
  26. 1 0
      configs/targets/mips-linux-user.mak
  27. 1 0
      configs/targets/mips-softmmu.mak
  28. 1 0
      configs/targets/mips64-linux-user.mak
  29. 1 0
      configs/targets/mips64-softmmu.mak
  30. 1 0
      configs/targets/mips64el-linux-user.mak
  31. 1 0
      configs/targets/mips64el-softmmu.mak
  32. 1 0
      configs/targets/mipsel-linux-user.mak
  33. 1 0
      configs/targets/mipsel-softmmu.mak
  34. 1 0
      configs/targets/mipsn32-linux-user.mak
  35. 1 0
      configs/targets/mipsn32el-linux-user.mak
  36. 1 0
      configs/targets/or1k-linux-user.mak
  37. 1 0
      configs/targets/or1k-softmmu.mak
  38. 1 0
      configs/targets/ppc-linux-user.mak
  39. 1 0
      configs/targets/ppc-softmmu.mak
  40. 1 0
      configs/targets/ppc64-linux-user.mak
  41. 1 0
      configs/targets/ppc64-softmmu.mak
  42. 1 0
      configs/targets/ppc64le-linux-user.mak
  43. 1 0
      configs/targets/riscv32-linux-user.mak
  44. 1 0
      configs/targets/riscv32-softmmu.mak
  45. 1 0
      configs/targets/riscv64-bsd-user.mak
  46. 1 0
      configs/targets/riscv64-linux-user.mak
  47. 1 0
      configs/targets/riscv64-softmmu.mak
  48. 1 0
      configs/targets/rx-softmmu.mak
  49. 1 0
      configs/targets/s390x-linux-user.mak
  50. 1 0
      configs/targets/s390x-softmmu.mak
  51. 1 0
      configs/targets/sh4-linux-user.mak
  52. 1 0
      configs/targets/sh4-softmmu.mak
  53. 1 0
      configs/targets/sh4eb-linux-user.mak
  54. 1 0
      configs/targets/sh4eb-softmmu.mak
  55. 1 0
      configs/targets/sparc-linux-user.mak
  56. 1 0
      configs/targets/sparc-softmmu.mak
  57. 1 0
      configs/targets/sparc32plus-linux-user.mak
  58. 1 0
      configs/targets/sparc64-linux-user.mak
  59. 1 0
      configs/targets/sparc64-softmmu.mak
  60. 1 0
      configs/targets/tricore-softmmu.mak
  61. 1 0
      configs/targets/x86_64-bsd-user.mak
  62. 1 0
      configs/targets/x86_64-linux-user.mak
  63. 1 0
      configs/targets/x86_64-softmmu.mak
  64. 1 0
      configs/targets/xtensa-linux-user.mak
  65. 1 0
      configs/targets/xtensa-softmmu.mak
  66. 1 0
      configs/targets/xtensaeb-linux-user.mak
  67. 1 0
      configs/targets/xtensaeb-softmmu.mak

+ 1 - 0
configs/targets/aarch64-bsd-user.mak

@@ -1,3 +1,4 @@
 TARGET_ARCH=aarch64
 TARGET_BASE_ARCH=arm
 TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/aarch64-pauth.xml
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/aarch64-linux-user.mak

@@ -6,3 +6,4 @@ CONFIG_SEMIHOSTING=y
 CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
 TARGET_SYSTBL_ABI=common,64,renameat,rlimit,memfd_secret
 TARGET_SYSTBL=syscall_64.tbl
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/aarch64-softmmu.mak

@@ -5,3 +5,4 @@ TARGET_KVM_HAVE_GUEST_DEBUG=y
 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
 # needed by boot.c
 TARGET_NEED_FDT=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/aarch64_be-linux-user.mak

@@ -7,3 +7,4 @@ CONFIG_SEMIHOSTING=y
 CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
 TARGET_SYSTBL_ABI=common,64,renameat,rlimit,memfd_secret
 TARGET_SYSTBL=syscall_64.tbl
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/alpha-linux-user.mak

@@ -1,3 +1,4 @@
 TARGET_ARCH=alpha
 TARGET_SYSTBL_ABI=common
 TARGET_SYSTBL=syscall.tbl
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/alpha-softmmu.mak

@@ -1,2 +1,3 @@
 TARGET_ARCH=alpha
 TARGET_SUPPORTS_MTTCG=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/arm-bsd-user.mak

@@ -1,2 +1,3 @@
 TARGET_ARCH=arm
 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
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/arm-linux-user.mak

@@ -5,3 +5,4 @@ TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml
 TARGET_HAS_BFLT=y
 CONFIG_SEMIHOSTING=y
 CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/arm-softmmu.mak

@@ -3,3 +3,4 @@ TARGET_SUPPORTS_MTTCG=y
 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
 # needed by boot.c
 TARGET_NEED_FDT=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/armeb-linux-user.mak

@@ -6,3 +6,4 @@ TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml
 TARGET_HAS_BFLT=y
 CONFIG_SEMIHOSTING=y
 CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/avr-softmmu.mak

@@ -1,2 +1,3 @@
 TARGET_ARCH=avr
 TARGET_XML_FILES= gdb-xml/avr-cpu.xml
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/hexagon-linux-user.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=hexagon
 TARGET_XML_FILES=gdb-xml/hexagon-core.xml gdb-xml/hexagon-hvx.xml
 TARGET_SYSTBL=syscall.tbl
 TARGET_SYSTBL_ABI=common,32,hexagon,time32,stat64,rlimit,renameat
+TARGET_LONG_BITS=32

+ 2 - 0
configs/targets/hppa-linux-user.mak

@@ -3,3 +3,5 @@ TARGET_ABI32=y
 TARGET_SYSTBL_ABI=common,32
 TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
+# Compromise to ease maintenance vs system mode
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/hppa-softmmu.mak

@@ -1,3 +1,4 @@
 TARGET_ARCH=hppa
 TARGET_BIG_ENDIAN=y
 TARGET_SUPPORTS_MTTCG=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/i386-bsd-user.mak

@@ -1,2 +1,3 @@
 TARGET_ARCH=i386
 TARGET_XML_FILES= gdb-xml/i386-32bit.xml
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/i386-linux-user.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=i386
 TARGET_SYSTBL_ABI=i386
 TARGET_SYSTBL=syscall_32.tbl
 TARGET_XML_FILES= gdb-xml/i386-32bit.xml gdb-xml/i386-32bit-linux.xml
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/i386-softmmu.mak

@@ -3,3 +3,4 @@ TARGET_SUPPORTS_MTTCG=y
 TARGET_KVM_HAVE_GUEST_DEBUG=y
 TARGET_KVM_HAVE_RESET_PARKED_VCPU=y
 TARGET_XML_FILES= gdb-xml/i386-32bit.xml
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/loongarch64-linux-user.mak

@@ -4,3 +4,4 @@ TARGET_BASE_ARCH=loongarch
 TARGET_XML_FILES=gdb-xml/loongarch-base64.xml gdb-xml/loongarch-fpu.xml gdb-xml/loongarch-lsx.xml gdb-xml/loongarch-lasx.xml
 TARGET_SYSTBL=syscall.tbl
 TARGET_SYSTBL_ABI=common,64
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/loongarch64-softmmu.mak

@@ -5,3 +5,4 @@ TARGET_SUPPORTS_MTTCG=y
 TARGET_XML_FILES= gdb-xml/loongarch-base32.xml gdb-xml/loongarch-base64.xml gdb-xml/loongarch-fpu.xml gdb-xml/loongarch-lsx.xml gdb-xml/loongarch-lasx.xml
 # all boards require libfdt
 TARGET_NEED_FDT=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/m68k-linux-user.mak

@@ -4,3 +4,4 @@ TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
 TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml
 TARGET_HAS_BFLT=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/m68k-softmmu.mak

@@ -1,3 +1,4 @@
 TARGET_ARCH=m68k
 TARGET_BIG_ENDIAN=y
 TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/microblaze-linux-user.mak

@@ -4,3 +4,4 @@ TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
 TARGET_HAS_BFLT=y
 TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
+TARGET_LONG_BITS=32

+ 3 - 0
configs/targets/microblaze-softmmu.mak

@@ -4,3 +4,6 @@ TARGET_SUPPORTS_MTTCG=y
 # needed by boot.c
 TARGET_NEED_FDT=y
 TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
+# System mode can address up to 64 bits via lea/sea instructions.
+# TODO: These bypass the mmu, so we could emulate these differently.
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/microblazeel-linux-user.mak

@@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common
 TARGET_SYSTBL=syscall.tbl
 TARGET_HAS_BFLT=y
 TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
+TARGET_LONG_BITS=32

+ 3 - 0
configs/targets/microblazeel-softmmu.mak

@@ -3,3 +3,6 @@ TARGET_SUPPORTS_MTTCG=y
 # needed by boot.c
 TARGET_NEED_FDT=y
 TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
+# System mode can address up to 64 bits via lea/sea instructions.
+# TODO: These bypass the mmu, so we could emulate these differently.
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/mips-linux-user.mak

@@ -3,3 +3,4 @@ TARGET_ABI_MIPSO32=y
 TARGET_SYSTBL_ABI=o32
 TARGET_SYSTBL=syscall_o32.tbl
 TARGET_BIG_ENDIAN=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/mips-softmmu.mak

@@ -1,3 +1,4 @@
 TARGET_ARCH=mips
 TARGET_BIG_ENDIAN=y
 TARGET_SUPPORTS_MTTCG=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/mips64-linux-user.mak

@@ -4,3 +4,4 @@ TARGET_BASE_ARCH=mips
 TARGET_SYSTBL_ABI=n64
 TARGET_SYSTBL=syscall_n64.tbl
 TARGET_BIG_ENDIAN=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/mips64-softmmu.mak

@@ -1,3 +1,4 @@
 TARGET_ARCH=mips64
 TARGET_BASE_ARCH=mips
 TARGET_BIG_ENDIAN=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/mips64el-linux-user.mak

@@ -3,3 +3,4 @@ TARGET_ABI_MIPSN64=y
 TARGET_BASE_ARCH=mips
 TARGET_SYSTBL_ABI=n64
 TARGET_SYSTBL=syscall_n64.tbl
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/mips64el-softmmu.mak

@@ -1,2 +1,3 @@
 TARGET_ARCH=mips64
 TARGET_BASE_ARCH=mips
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/mipsel-linux-user.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=mips
 TARGET_ABI_MIPSO32=y
 TARGET_SYSTBL_ABI=o32
 TARGET_SYSTBL=syscall_o32.tbl
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/mipsel-softmmu.mak

@@ -1,2 +1,3 @@
 TARGET_ARCH=mips
 TARGET_SUPPORTS_MTTCG=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/mipsn32-linux-user.mak

@@ -5,3 +5,4 @@ TARGET_BASE_ARCH=mips
 TARGET_SYSTBL_ABI=n32
 TARGET_SYSTBL=syscall_n32.tbl
 TARGET_BIG_ENDIAN=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/mipsn32el-linux-user.mak

@@ -4,3 +4,4 @@ TARGET_ABI32=y
 TARGET_BASE_ARCH=mips
 TARGET_SYSTBL_ABI=n32
 TARGET_SYSTBL=syscall_n32.tbl
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/or1k-linux-user.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=openrisc
 TARGET_BIG_ENDIAN=y
 TARGET_SYSTBL_ABI=common,32,or1k,time32,stat64,rlimit,renameat
 TARGET_SYSTBL=syscall.tbl
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/or1k-softmmu.mak

@@ -3,3 +3,4 @@ TARGET_SUPPORTS_MTTCG=y
 TARGET_BIG_ENDIAN=y
 # needed by boot.c and all boards
 TARGET_NEED_FDT=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/ppc-linux-user.mak

@@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common,nospu,32
 TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
 TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/ppc-softmmu.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=ppc
 TARGET_BIG_ENDIAN=y
 TARGET_KVM_HAVE_GUEST_DEBUG=y
 TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/ppc64-linux-user.mak

@@ -5,3 +5,4 @@ TARGET_SYSTBL_ABI=common,nospu,64
 TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
 TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/ppc64-softmmu.mak

@@ -6,3 +6,4 @@ TARGET_KVM_HAVE_GUEST_DEBUG=y
 TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
 # all boards require libfdt
 TARGET_NEED_FDT=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/ppc64le-linux-user.mak

@@ -4,3 +4,4 @@ TARGET_ABI_DIR=ppc
 TARGET_SYSTBL_ABI=common,nospu,64
 TARGET_SYSTBL=syscall.tbl
 TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/riscv32-linux-user.mak

@@ -7,3 +7,4 @@ CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
 TARGET_SYSTBL_ABI=32
 TARGET_SYSTBL_ABI=common,32,riscv,memfd_secret
 TARGET_SYSTBL=syscall.tbl
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/riscv32-softmmu.mak

@@ -4,3 +4,4 @@ TARGET_SUPPORTS_MTTCG=y
 TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml
 # needed by boot.c
 TARGET_NEED_FDT=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/riscv64-bsd-user.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=riscv64
 TARGET_BASE_ARCH=riscv
 TARGET_ABI_DIR=riscv
 TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/riscv64-linux-user.mak

@@ -7,3 +7,4 @@ CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
 TARGET_SYSTBL_ABI=64
 TARGET_SYSTBL_ABI=common,64,riscv,rlimit,memfd_secret
 TARGET_SYSTBL=syscall.tbl
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/riscv64-softmmu.mak

@@ -5,3 +5,4 @@ TARGET_KVM_HAVE_GUEST_DEBUG=y
 TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-virtual.xml
 # needed by boot.c
 TARGET_NEED_FDT=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/rx-softmmu.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=rx
 TARGET_XML_FILES= gdb-xml/rx-core.xml
 # all boards require libfdt
 TARGET_NEED_FDT=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/s390x-linux-user.mak

@@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common,64
 TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
 TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-virt-kvm.xml gdb-xml/s390-gs.xml
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/s390x-softmmu.mak

@@ -3,3 +3,4 @@ TARGET_BIG_ENDIAN=y
 TARGET_SUPPORTS_MTTCG=y
 TARGET_KVM_HAVE_GUEST_DEBUG=y
 TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-virt-kvm.xml gdb-xml/s390-gs.xml
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/sh4-linux-user.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=sh4
 TARGET_SYSTBL_ABI=common
 TARGET_SYSTBL=syscall.tbl
 TARGET_HAS_BFLT=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/sh4-softmmu.mak

@@ -1 +1,2 @@
 TARGET_ARCH=sh4
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/sh4eb-linux-user.mak

@@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common
 TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
 TARGET_HAS_BFLT=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/sh4eb-softmmu.mak

@@ -1,2 +1,3 @@
 TARGET_ARCH=sh4
 TARGET_BIG_ENDIAN=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/sparc-linux-user.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=sparc
 TARGET_SYSTBL_ABI=common,32
 TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/sparc-softmmu.mak

@@ -1,3 +1,4 @@
 TARGET_ARCH=sparc
 TARGET_BIG_ENDIAN=y
 TARGET_SUPPORTS_MTTCG=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/sparc32plus-linux-user.mak

@@ -5,3 +5,4 @@ TARGET_ABI_DIR=sparc
 TARGET_SYSTBL_ABI=common,32
 TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/sparc64-linux-user.mak

@@ -4,3 +4,4 @@ TARGET_ABI_DIR=sparc
 TARGET_SYSTBL_ABI=common,64
 TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/sparc64-softmmu.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=sparc64
 TARGET_BASE_ARCH=sparc
 TARGET_BIG_ENDIAN=y
 TARGET_SUPPORTS_MTTCG=y
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/tricore-softmmu.mak

@@ -1 +1,2 @@
 TARGET_ARCH=tricore
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/x86_64-bsd-user.mak

@@ -1,3 +1,4 @@
 TARGET_ARCH=x86_64
 TARGET_BASE_ARCH=i386
 TARGET_XML_FILES= gdb-xml/i386-64bit.xml
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/x86_64-linux-user.mak

@@ -3,3 +3,4 @@ TARGET_BASE_ARCH=i386
 TARGET_SYSTBL_ABI=common,64
 TARGET_SYSTBL=syscall_64.tbl
 TARGET_XML_FILES= gdb-xml/i386-64bit.xml gdb-xml/i386-64bit-linux.xml
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/x86_64-softmmu.mak

@@ -4,3 +4,4 @@ TARGET_SUPPORTS_MTTCG=y
 TARGET_KVM_HAVE_GUEST_DEBUG=y
 TARGET_KVM_HAVE_RESET_PARKED_VCPU=y
 TARGET_XML_FILES= gdb-xml/i386-64bit.xml
+TARGET_LONG_BITS=64

+ 1 - 0
configs/targets/xtensa-linux-user.mak

@@ -2,3 +2,4 @@ TARGET_ARCH=xtensa
 TARGET_SYSTBL_ABI=common
 TARGET_SYSTBL=syscall.tbl
 TARGET_HAS_BFLT=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/xtensa-softmmu.mak

@@ -1,2 +1,3 @@
 TARGET_ARCH=xtensa
 TARGET_SUPPORTS_MTTCG=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/xtensaeb-linux-user.mak

@@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common
 TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
 TARGET_HAS_BFLT=y
+TARGET_LONG_BITS=32

+ 1 - 0
configs/targets/xtensaeb-softmmu.mak

@@ -1,3 +1,4 @@
 TARGET_ARCH=xtensa
 TARGET_BIG_ENDIAN=y
 TARGET_SUPPORTS_MTTCG=y
+TARGET_LONG_BITS=32