From 579af51964e21201d11b9d5bd371e2de0da8d0c3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 3 Jul 2014 15:59:32 +0200 Subject: [PATCH 1/1] architecture: also add tuples for old ARM BE ABI --- src/shared/architecture.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/shared/architecture.h b/src/shared/architecture.h index a014ad6c1..4821d5d28 100644 --- a/src/shared/architecture.h +++ b/src/shared/architecture.h @@ -23,7 +23,10 @@ #include "util.h" -/* A cleaned up architecture definition */ +/* A cleaned up architecture definition. We don't want to get lost in + * processor features, models, generations or even ABIs. Hence we + * focus on general family, and distuignish word width and + * endianess. */ typedef enum Architecture { ARCHITECTURE_X86 = 0, @@ -143,10 +146,14 @@ Architecture uname_architecture(void); #elif defined(__arm__) # if defined(WORDS_BIGENDIAN) # define native_architecture() ARCHITECTURE_ARM_BE -# if defined(__ARM_PCS_VFP) -# define LIB_ARCH_TUPLE "armeb-linux-gnueabihf" +# if defined(__ARM_EABI__) +# if defined(__ARM_PCS_VFP) +# define LIB_ARCH_TUPLE "armeb-linux-gnueabihf" +# else +# define LIB_ARCH_TUPLE "armeb-linux-gnueabi" +# endif # else -# define LIB_ARCH_TUPLE "armeb-linux-gnueabi" +# define LIB_ARCH_TUPLE "armeb-linux-gnu" # endif # else # define native_architecture() ARCHITECTURE_ARM -- 2.30.2