defs.h: simplify PERSONALITY1_WORDSIZE definition

Move definition of PERSONALITY1_WORDSIZE macro outside arch specific
ifdefs.

* defs.h [SPARC64 || X86_64 || X32 || AARCH64 || POWERPC64 || TILE]
(PERSONALITY1_WORDSIZE): Remove.
[SUPPORTED_PERSONALITIES > 1] (PERSONALITY1_WORDSIZE): Define to 4
unconditionally.
This commit is contained in:
2016-08-08 21:52:05 +00:00
parent 8d92151c66
commit abfc0a6d59

10
defs.h
View File

@ -153,33 +153,27 @@ extern char *stpcpy(char *dst, const char *src);
#ifdef SPARC64
# define SUPPORTED_PERSONALITIES 2
# define PERSONALITY1_WORDSIZE 4
#endif
#ifdef X86_64
# define SUPPORTED_PERSONALITIES 3
# define PERSONALITY1_WORDSIZE 4
# define PERSONALITY2_WORDSIZE 4
#endif
#ifdef X32
# define SUPPORTED_PERSONALITIES 2
# define PERSONALITY1_WORDSIZE 4
#endif
#ifdef AARCH64
# define SUPPORTED_PERSONALITIES 2
# define PERSONALITY1_WORDSIZE 4
#endif
#ifdef POWERPC64
# define SUPPORTED_PERSONALITIES 2
# define PERSONALITY1_WORDSIZE 4
#endif
#ifdef TILE
# define SUPPORTED_PERSONALITIES 2
# define PERSONALITY1_WORDSIZE 4
# ifdef __tilepro__
# define DEFAULT_PERSONALITY 1
# endif
@ -196,6 +190,10 @@ extern char *stpcpy(char *dst, const char *src);
#define PERSONALITY0_INCLUDE_PRINTERS_DECLS "native_printer_decls.h"
#define PERSONALITY0_INCLUDE_PRINTERS_DEFS "native_printer_defs.h"
#if SUPPORTED_PERSONALITIES > 1
# define PERSONALITY1_WORDSIZE 4
#endif
#if SUPPORTED_PERSONALITIES > 1 && defined HAVE_M32_MPERS
# define PERSONALITY1_INCLUDE_PRINTERS_DECLS "m32_printer_decls.h"
# define PERSONALITY1_INCLUDE_PRINTERS_DEFS "m32_printer_defs.h"