basic: Fix incorrect architecture mapping on sparc64. (#3274)

diff --git a/src/basic/architecture.c b/src/basic/architecture.c
index 8e2c2b02d2dc9a90cc1135ad3e7c5fe55aef14dd..b1c8e91f50a9bae3823d2df0f2c401a277f29660 100644 (file)
--- 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 91ec108e04d712d2a809751674b45d3f84c030d7..b3e4d859068a57b22017edd5e5363e86ea33e937 100644 (file)
--- 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__)