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

Author: glaubitz

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__)

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__)