]> granicus.if.org Git - strace/commitdiff
defs.h: simplify PERSONALITY0_WORDSIZE definition
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 8 Aug 2016 21:41:09 +0000 (21:41 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 8 Aug 2016 23:28:29 +0000 (23:28 +0000)
Move definition of PERSONALITY0_WORDSIZE macro outside arch specific
ifdefs.

* defs.h (PERSONALITY0_WORDSIZE): Define to SIZEOF_LONG unconditionally.

defs.h

diff --git a/defs.h b/defs.h
index 76498d6a8606c3c4c4b78801709ffad8a103d3e9..50a66d373700b02a062810f844ebed50ab665496 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -153,38 +153,32 @@ extern char *stpcpy(char *dst, const char *src);
 
 #ifdef SPARC64
 # define SUPPORTED_PERSONALITIES 2
-# define PERSONALITY0_WORDSIZE 8
 # define PERSONALITY1_WORDSIZE 4
 #endif
 
 #ifdef X86_64
 # define SUPPORTED_PERSONALITIES 3
-# define PERSONALITY0_WORDSIZE 8
 # define PERSONALITY1_WORDSIZE 4
 # define PERSONALITY2_WORDSIZE 4
 #endif
 
 #ifdef X32
 # define SUPPORTED_PERSONALITIES 2
-# define PERSONALITY0_WORDSIZE 4
 # define PERSONALITY1_WORDSIZE 4
 #endif
 
 #ifdef AARCH64
 # define SUPPORTED_PERSONALITIES 2
-# define PERSONALITY0_WORDSIZE 8
 # define PERSONALITY1_WORDSIZE 4
 #endif
 
 #ifdef POWERPC64
 # define SUPPORTED_PERSONALITIES 2
-# define PERSONALITY0_WORDSIZE 8
 # define PERSONALITY1_WORDSIZE 4
 #endif
 
 #ifdef TILE
 # define SUPPORTED_PERSONALITIES 2
-# define PERSONALITY0_WORDSIZE 8
 # define PERSONALITY1_WORDSIZE 4
 # ifdef __tilepro__
 #  define DEFAULT_PERSONALITY 1
@@ -197,10 +191,8 @@ extern char *stpcpy(char *dst, const char *src);
 #ifndef DEFAULT_PERSONALITY
 # define DEFAULT_PERSONALITY 0
 #endif
-#ifndef PERSONALITY0_WORDSIZE
-# define PERSONALITY0_WORDSIZE SIZEOF_LONG
-#endif
 
+#define PERSONALITY0_WORDSIZE SIZEOF_LONG
 #define PERSONALITY0_INCLUDE_PRINTERS_DECLS "native_printer_decls.h"
 #define PERSONALITY0_INCLUDE_PRINTERS_DEFS "native_printer_defs.h"