From 9ebdd4226d9eac47bb1481c6c72dea05c3fe29d9 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Mon, 24 Sep 2012 09:25:58 -0400
Subject: [PATCH] staplog.c: Use tighter #if / #elif chain for crash/defs ARCH
 #defines

Just to make doubly triple-sure that no more than one of the macros gets set.
---
 staplog.c | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/staplog.c b/staplog.c
index e2e67d4be..809405305 100644
--- a/staplog.c
+++ b/staplog.c
@@ -22,32 +22,26 @@
 
 /* crash/defs.h defines NR_CPUS based upon architecture macros
    X86, X86_64, etc.  See crash/configure.c (!). */
-#ifdef __alpha__
+#if defined(__alpha__)
 #define ALPHA
-#endif
-#ifdef __i386__
+#elif defined(__x86_64__)
+#define X86_64
+#elif defined(__i386__)
 #define X86
-#endif
-#ifdef __powerpc__
+#elif defined(__powerpc64__)
+#define PPC64
+#elif defined(__powerpc__)
 #define PPC
-#endif
-#ifdef __ia64__
+#elif defined(__ia64__)
 #define IA64
-#endif
-#ifdef __s390__
-#define S390
-#endif
-#ifdef __s390x__
+#elif defined(__s390x__)
 #define S390X
-#endif
-#ifdef __powerpc64__
-#define PPC64
-#endif
-#ifdef __x86_64__
-#define X86_64
-#endif
-#ifdef __arm__
+#elif defined(__s390__)
+#define S390
+#elif defined(__arm__)
 #define ARM
+#else
+#warn "unknown architecture for crash/staplog support"
 #endif
 
 #include <crash/defs.h>
-- 
2.43.5