[llvm] r274042 - [lanai] Update ELF number to correspond to the assigned number.

[Jacques Pienaar via llvm-commits]

Author: jpienaar
Date: Tue Jun 28 13:22:22 2016
New Revision: 274042

URL: http://llvm.org/viewvc/llvm-project?rev=274042&view=rev
Log:
[lanai] Update ELF number to correspond to the assigned number.

Change EM_LANAI to correspond to machine number assigned by Xinuos.


Modified:
    llvm/trunk/include/llvm/Support/ELF.h
    llvm/trunk/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai
    llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai
    llvm/trunk/test/tools/llvm-readobj/file-headers.test

Modified: llvm/trunk/include/llvm/Support/ELF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/ELF.h?rev=274042&r1=274041&r2=274042&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/ELF.h (original)
+++ llvm/trunk/include/llvm/Support/ELF.h Tue Jun 28 13:22:22 2016
@@ -310,16 +310,12 @@ enum {
   EM_NORC          = 218, // Nanoradio Optimized RISC
   EM_CSR_KALIMBA   = 219, // CSR Kalimba architecture family
   EM_AMDGPU        = 224, // AMD GPU architecture
+  EM_LANAI         = 244, // Lanai 32-bit processor
 
   // A request has been made to the maintainer of the official registry for
   // such numbers for an official value for WebAssembly. As soon as one is
   // allocated, this enum will be updated to use it.
   EM_WEBASSEMBLY   = 0x4157, // WebAssembly architecture
-
-  // A request has been made to the maintainer of the official registry for
-  // an official value for Lanai. As soon as one is allocated, this enum will be
-  // updated to use it.
-  EM_LANAI         = 0x8123, // Lanai 32-bit processor
 };
 
 // Object file classes.

Modified: llvm/trunk/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai?rev=274042&r1=274041&r2=274042&view=diff
==============================================================================
Binary files - no diff available.

Modified: llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai?rev=274042&r1=274041&r2=274042&view=diff
==============================================================================
Binary files - no diff available.

Modified: llvm/trunk/test/tools/llvm-readobj/file-headers.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/file-headers.test?rev=274042&r1=274041&r2=274042&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/file-headers.test (original)
+++ llvm/trunk/test/tools/llvm-readobj/file-headers.test Tue Jun 28 13:22:22 2016
@@ -353,7 +353,7 @@ ELF-LANAI-NEXT:     ABIVersion: 0
 ELF-LANAI-NEXT:     Unused: (00 00 00 00 00 00 00)
 ELF-LANAI-NEXT:   }
 ELF-LANAI-NEXT:   Type: Relocatable (0x1)
-ELF-LANAI-NEXT:   Machine: EM_LANAI (0x8123)
+ELF-LANAI-NEXT:   Machine: EM_LANAI (0xF4)
 ELF-LANAI-NEXT:   Version: 1
 ELF-LANAI-NEXT:   Entry: 0x0
 ELF-LANAI-NEXT:   ProgramHeaderOffset: 0x0