From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 22 Feb 2016 14:50:35 +0000 (+0100)
Subject: util-lib: support various ppc archs in personality logic
X-Git-Tag: v231.3~232
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=7c63821717d67bce186ea28cd5392ff54cc8ffbc

util-lib: support various ppc archs in personality logic
---

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index a50674ea0..69a41d90b 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -721,6 +721,37 @@ unsigned long personality_from_string(const char *p) {
 
         if (architecture == ARCHITECTURE_S390)
                 return PER_LINUX;
+
+#elif defined(__powerpc64__)
+#  if __BYTE_ORDER == __BIG_ENDIAN
+
+        if (architecture == ARCHITECTURE_PPC_LE)
+                return PER_LINUX32;
+
+        if (architecture == ARCHITECTURE_PPC64_LE)
+                return PER_LINUX;
+
+#  else
+
+        if (architecture == ARCHITECTURE_PPC)
+                return PER_LINUX32;
+
+        if (architecture == ARCHITECTURE_PPC64)
+                return PER_LINUX;
+
+#  endif
+#elif defined(__powerpc__)
+#  if __BYTE_ORDER == __BIG_ENDIAN
+
+        if (architecture == ARCHITECTURE_PPC)
+                return PER_LINUX;
+
+#  else
+
+        if (architecture == ARCHITECTURE_PPC_LE)
+                return PER_LINUX;
+
+#  endif
 #endif
 
         return PERSONALITY_INVALID;
@@ -753,6 +784,34 @@ const char* personality_to_string(unsigned long p) {
         if (p == PER_LINUX)
                 architecture = ARCHITECTURE_S390;
 
+#elif defined(__powerpc64__)
+#  if __BYTE_ORDER == __BIG_ENDIAN
+
+        if (p == PER_LINUX)
+                architecture = ARCHITECTURE_PPC64;
+        else if (p == PER_LINUX32)
+                 architecture = ARCHITECTURE_PPC;
+
+#  else
+
+        if (p == PER_LINUX)
+                architecture = ARCHITECTURE_PPC64_LE;
+        else if (p == PER_LINUX32)
+                architecture = ARCHITECTURE_PPC_LE;
+
+#  endif
+#elif defined(__powerpc__)
+#  if __BYTE_ORDER == __BIG_ENDIAN
+
+        if (p == PER_LINUX)
+                architecture = ARCHITECTURE_PPC;
+
+#  else
+
+        if (p == PER_LINUX)
+                architecture = ARCHITECTURE_PPC_LE;
+
+#  endif
 #endif
 
         if (architecture < 0)