From f8fd4fc4cd9138576cb1cec15c6ac9416e51eeb8 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 17 Apr 2013 16:26:40 +0200 Subject: elfload: use abi_int/uint instead of target_int/uint The alignment is a characteristic of the ABI, not the CPU. Signed-off-by: Paolo Bonzini Signed-off-by: Edgar E. Iglesias --- include/exec/user/abitypes.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include/exec/user') diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h index abaa028ce7..4f3e804786 100644 --- a/include/exec/user/abitypes.h +++ b/include/exec/user/abitypes.h @@ -2,12 +2,21 @@ #define QEMU_TYPES_H #include "cpu.h" +#ifdef TARGET_M68K +#define ABI_INT_ALIGNMENT 2 +#endif + #ifndef ABI_SHORT_ALIGNMENT #define ABI_SHORT_ALIGNMENT 2 #endif +#ifndef ABI_INT_ALIGNMENT +#define ABI_INT_ALIGNMENT 4 +#endif typedef int16_t abi_short __attribute__ ((aligned(ABI_SHORT_ALIGNMENT))); typedef uint16_t abi_ushort __attribute__((aligned(ABI_SHORT_ALIGNMENT))); +typedef int32_t abi_int __attribute__((aligned(ABI_INT_ALIGNMENT))); +typedef uint32_t abi_uint __attribute__((aligned(ABI_INT_ALIGNMENT))); #ifdef TARGET_ABI32 typedef uint32_t abi_ulong; -- cgit v1.2.3-55-g7522