[systemd-commits] 2 commits - Makefile.am configure.ac src/shared

[Lennart Poettering]

 Makefile.am               |   16 ++++++++--------
 configure.ac              |    2 +-
 src/shared/architecture.c |    4 ++++
 src/shared/architecture.h |   14 ++++++++++++--
 4 files changed, 25 insertions(+), 11 deletions(-)

New commits:
commit 62ca29b81b5f19007889439b744a16776607a55e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Feb 24 19:25:00 2014 +0100

    build-sys: bump revisions and version

diff --git a/Makefile.am b/Makefile.am
index d2dcddb..529b525 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,28 +39,28 @@ LIBUDEV_CURRENT=5
 LIBUDEV_REVISION=0
 LIBUDEV_AGE=4
 
-LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=3
-LIBGUDEV_AGE=1
+LIBGUDEV_CURRENT=2
+LIBGUDEV_REVISION=0
+LIBGUDEV_AGE=2
 
 LIBSYSTEMD_LOGIN_CURRENT=9
-LIBSYSTEMD_LOGIN_REVISION=2
+LIBSYSTEMD_LOGIN_REVISION=3
 LIBSYSTEMD_LOGIN_AGE=9
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=11
+LIBSYSTEMD_DAEMON_REVISION=12
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=27
+LIBSYSTEMD_ID128_REVISION=28
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=4
+LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
 LIBSYSTEMD_CURRENT=0
-LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_REVISION=1
 LIBSYSTEMD_AGE=0
 
 # Dirs of external packages
diff --git a/configure.ac b/configure.ac
index 10ef0f5..7920d6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([systemd],
-        [209],
+        [210],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd],
         [systemd],
         [http://www.freedesktop.org/wiki/Software/systemd])

commit ae0e60fbbc28990617964204ea925a1ef8f42262
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Feb 24 19:21:18 2014 +0100

    architecture: apparently there is LE ppc now

diff --git a/src/shared/architecture.c b/src/shared/architecture.c
index 1dc5fa5..ceba492 100644
--- a/src/shared/architecture.c
+++ b/src/shared/architecture.c
@@ -51,7 +51,9 @@ Architecture uname_architecture(void) {
                 { "i386",       ARCHITECTURE_X86      },
 #elif defined(__powerpc__) || defined(__powerpc64__)
                 { "ppc64",      ARCHITECTURE_PPC64    },
+                { "ppc64le",    ARCHITECTURE_PPC64_LE },
                 { "ppc",        ARCHITECTURE_PPC      },
+                { "ppcle",      ARCHITECTURE_PPC_LE   },
 #elif defined(__ia64__)
                 { "ia64",       ARCHITECTURE_IA64     },
 #elif defined(__hppa__) || defined(__hppa64__)
@@ -136,7 +138,9 @@ static const char *const architecture_table[_ARCHITECTURE_MAX] = {
         [ARCHITECTURE_X86] = "x86",
         [ARCHITECTURE_X86_64] = "x86-64",
         [ARCHITECTURE_PPC] = "ppc",
+        [ARCHITECTURE_PPC_LE] = "ppc-le",
         [ARCHITECTURE_PPC64] = "ppc64",
+        [ARCHITECTURE_PPC64_LE] = "ppc64-le",
         [ARCHITECTURE_IA64] = "ia64",
         [ARCHITECTURE_PARISC] = "parisc",
         [ARCHITECTURE_PARISC64] = "parisc64",
diff --git a/src/shared/architecture.h b/src/shared/architecture.h
index 58a8164..3183645 100644
--- a/src/shared/architecture.h
+++ b/src/shared/architecture.h
@@ -27,7 +27,9 @@ typedef enum Architecture {
         ARCHITECTURE_X86 = 0,
         ARCHITECTURE_X86_64,
         ARCHITECTURE_PPC,
+        ARCHITECTURE_PPC_LE,
         ARCHITECTURE_PPC64,
+        ARCHITECTURE_PPC64_LE,
         ARCHITECTURE_IA64,
         ARCHITECTURE_PARISC,
         ARCHITECTURE_PARISC64,
@@ -56,9 +58,17 @@ Architecture uname_architecture(void);
 #elif defined(__i386__)
 #  define native_architecture() ARCHITECTURE_X86
 #elif defined(__powerpc64__)
-#  define native_architecture() ARCHITECTURE_PPC64
+#  if defined(WORDS_BIGENDIAN)
+#    define native_architecture() ARCHITECTURE_PPC64
+#  else
+#    define native_architecture() ARCHITECTURE_PPC64_LE
+#  endif
 #elif defined(__powerpc__)
-#  define native_architecture() ARCHITECTURE_PPC
+#  if defined(WORDS_BIGENDIAN)
+#    define native_architecture() ARCHITECTURE_PPC
+#  else
+#    define native_architecture() ARCHITECTURE_PPC_LE
+#  endif
 #elif defined(__ia64__)
 #  define native_architecture() ARCHITECTURE_IA64
 #elif defined(__hppa64__)