diff options
| author | John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> | 2016-05-16 21:25:36 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-05-16 21:25:36 +0200 |
| commit | cd042078df2151d7824abf91107a0d4a8716e54f (patch) | |
| tree | af197f17aa07415004bd03e4ddd14cf3e73d5140 | |
| parent | 833f92ad39beca0e954e91e5764ffc83f8d0c1cf (diff) | |
| download | systemd-cd042078df2151d7824abf91107a0d4a8716e54f.tar.gz | |
basic: Fix incorrect architecture mapping on sparc64. (#3274)
| -rw-r--r-- | src/basic/architecture.c | 2 | ||||
| -rw-r--r-- | src/basic/architecture.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/architecture.c b/src/basic/architecture.c index 8e2c2b02d2..b1c8e91f50 100644 --- a/src/basic/architecture.c +++ b/src/basic/architecture.c @@ -63,7 +63,7 @@ int uname_architecture(void) { #elif defined(__s390__) || defined(__s390x__) { "s390x", ARCHITECTURE_S390X }, { "s390", ARCHITECTURE_S390 }, -#elif defined(__sparc__) || defined(__sparc64__) +#elif defined(__sparc__) { "sparc64", ARCHITECTURE_SPARC64 }, { "sparc", ARCHITECTURE_SPARC }, #elif defined(__mips__) || defined(__mips64__) diff --git a/src/basic/architecture.h b/src/basic/architecture.h index 91ec108e04..b3e4d85906 100644 --- a/src/basic/architecture.h +++ b/src/basic/architecture.h @@ -116,7 +116,7 @@ int uname_architecture(void); #elif defined(__s390__) # define native_architecture() ARCHITECTURE_S390 # define LIB_ARCH_TUPLE "s390-linux-gnu" -#elif defined(__sparc64__) +#elif defined(__sparc__) && defined (__arch64__) # define native_architecture() ARCHITECTURE_SPARC64 # define LIB_ARCH_TUPLE "sparc64-linux-gnu" #elif defined(__sparc__) |