From 2b1421826c8f074da53b3c01611c2bab61e3aa76 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 27 Sep 2016 18:18:36 +0200 Subject: ldd: fix compile for some architectures Reorder entries alphabetically (architecture name as order criterium) and remove unused entries. --- utils/ldd.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/utils/ldd.c b/utils/ldd.c index 5d2c8f4c7..5b41e2e60 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -40,8 +40,18 @@ #define ELFCLASSM ELFCLASS32 #endif -#if defined(__s390__) -#define MATCH_MACHINE(x) (x == EM_S390) +#if defined(__TMS320C6X__) +#define MATCH_MACHINE(x) (x == EM_TI_C6000) +#define ELFCLASSM ELFCLASS32 +#endif + +#if defined(__cris__) +#define MATCH_MACHINE(x) (x == EM_CRIS) +#define ELFCLASSM ELFCLASS32 +#endif + +#if defined(__frv__) +#define MATCH_MACHINE(x) (x == EM_CYGNUS_FRV) #define ELFCLASSM ELFCLASS32 #endif @@ -78,15 +88,22 @@ #define ELFCLASSM ELFCLASS32 #endif +#if defined(__microblaze__) +#define MATCH_MACHINE(x) (x == EM_MICROBLAZE) +#define ELFCLASSM ELFCLASS32 +#endif + #if defined(__mips__) #define MATCH_MACHINE(x) (x == EM_MIPS || x == EM_MIPS_RS3_LE) #define ELFCLASSM ELFCLASS32 #endif -#if defined(__powerpc64__) -#define MATCH_MACHINE(x) (x == EM_PPC64) -#define ELFCLASSM ELFCLASS64 -#elif defined(__powerpc__) +#if defined(__nds32__) +#define MATCH_MACHINE(x) (x == EM_NDS32) +#define ELFCLASSM ELFCLASS32 +#endif + +#if defined(__powerpc__) #define MATCH_MACHINE(x) (x == EM_PPC) #define ELFCLASSM ELFCLASS32 #endif @@ -101,21 +118,11 @@ #define ELFCLASSM ELFCLASS32 #endif -#if defined(__cris__) -#define MATCH_MACHINE(x) (x == EM_CRIS) -#define ELFCLASSM ELFCLASS32 -#endif - #if defined(__x86_64__) #define MATCH_MACHINE(x) (x == EM_X86_64) #define ELFCLASSM ELFCLASS64 #endif -#if defined(__microblaze__) -#define MATCH_MACHINE(x) (x == EM_MICROBLAZE) -#define ELFCLASSM ELFCLASS32 -#endif - #if defined(__xtensa__) #define MATCH_MACHINE(x) (x == EM_XTENSA) #define ELFCLASSM ELFCLASS32 -- cgit v1.2.3