[git commit] include/elf.h: bump EM_NUM

[Bernhard Reutner-Fischer]

commit: http://git.uclibc.org/uClibc/commit/?id=cf8e466f8959fb22ab41cfe5e16951ef4bd19a80
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

and remove a few ancient entries

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 include/elf.h |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/include/elf.h b/include/elf.h
index 917930b..91fe9f9 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -267,8 +267,13 @@ typedef struct
 #define EM_BLACKFIN	106		/* Analog Devices Blackfin */
 #define EM_ALTERA_NIOS2	113	/* Altera Nios II soft-core processor */
 #define EM_CRX		114		/* National Semiconductor CRX */
-#define EM_NUM		95
 #define EM_TI_C6000	140
+#define EM_METAG	174		/* Imagination Technologies Meta */
+#define EM_MICROBLAZE	189	/* Xilinx Microblaze */
+#define EM_ARCV2	195		/* ARCv2 Cores */
+
+/* NEXT FREE NUMBER: Increment this after adding your official arch number */
+#define EM_NUM		196
 
 /* If it is necessary to assign new unofficial EM_* values, please pick large
    random numbers (0x8523, 0xa7f2, etc.) to minimize the chances of collision
@@ -282,22 +287,9 @@ typedef struct
    unofficial e_machine number should eventually ask registry at caldera.com for
    an officially blessed number to be added to the list above.  */
 
-/* Imagination Technologies Meta */
-#define EM_METAG        174
-
-/* picoJava */
-#define EM_PJ_OLD	99
-
 /* Cygnus PowerPC ELF backend.  Written in the absence of an ABI.  */
 #define EM_CYGNUS_POWERPC 0x9025
 
-/* Old version of Sparc v9, from before the ABI; this should be
-   removed shortly.  */
-#define EM_OLD_SPARCV9	11
-
-/* Old version of PowerPC, this should be removed shortly. */
-#define EM_PPC_OLD	17
-
 /* (Deprecated) Temporary number for the OpenRISC processor.  */
 #define EM_OR32		0x8472
 
@@ -376,10 +368,6 @@ typedef struct
  */
 #define EM_MICROBLAZE_OLD   0xbaab
 
-/* Xilinx Microblaze (official) */
-#define EM_MICROBLAZE   189
-#define EM_ARCV2	195		/* ARCv2 Cores */
-
 /* Legal values for e_version (version).  */
 
 #define EV_NONE		0		/* Invalid ELF version */