ldd: fix compile for some architectures

Reorder entries alphabetically (architecture name as order
criterium) and remove unused entries.

utils/ldd.c

@@ -40,8 +40,18 @@
 #define ELFCLASSM      ELFCLASS32
 #endif
 
-#if defined(__s390__)
+#if defined(__TMS320C6X__)
-#define MATCH_MACHINE(x) (x == EM_S390)
+#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__)
+#if defined(__nds32__)
-#define MATCH_MACHINE(x) (x == EM_PPC64)
+#define MATCH_MACHINE(x) (x == EM_NDS32)
-#define ELFCLASSM	ELFCLASS64
+#define ELFCLASSM	ELFCLASS32
-#elif defined(__powerpc__)
+#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