From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 8 Aug 2016 22:00:06 +0000 (+0000)
Subject: defs.h: simplify SUPPORTED_PERSONALITIES definition
X-Git-Tag: v4.14~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2107d57e410e839dc4e73665785fd3e5bdf9fd1;p=strace

defs.h: simplify SUPPORTED_PERSONALITIES definition

* defs.h: Group definition of SUPPORTED_PERSONALITIES by value.
---

diff --git a/defs.h b/defs.h
index 3d504ae3..709d9a4a 100644
--- a/defs.h
+++ b/defs.h
@@ -151,38 +151,22 @@ extern char *stpcpy(char *dst, const char *src);
 # define ERESTART_RESTARTBLOCK 516
 #endif
 
-#ifdef SPARC64
-# define SUPPORTED_PERSONALITIES 2
-#endif
-
-#ifdef X86_64
+#if defined X86_64
 # define SUPPORTED_PERSONALITIES 3
 # define PERSONALITY2_WORDSIZE 4
-#endif
-
-#ifdef X32
-# define SUPPORTED_PERSONALITIES 2
-#endif
-
-#ifdef AARCH64
-# define SUPPORTED_PERSONALITIES 2
-#endif
-
-#ifdef POWERPC64
+#elif defined AARCH64 \
+   || defined POWERPC64 \
+   || defined SPARC64 \
+   || defined TILE \
+   || defined X32
 # define SUPPORTED_PERSONALITIES 2
-#endif
-
-#ifdef TILE
-# define SUPPORTED_PERSONALITIES 2
-# ifdef __tilepro__
-#  define DEFAULT_PERSONALITY 1
-# endif
-#endif
-
-#ifndef SUPPORTED_PERSONALITIES
+#else
 # define SUPPORTED_PERSONALITIES 1
 #endif
-#ifndef DEFAULT_PERSONALITY
+
+#if defined TILE && defined __tilepro__
+# define DEFAULT_PERSONALITY 1
+#else
 # define DEFAULT_PERSONALITY 0
 #endif