[lanai] Update ELF number to correspond to the assigned number.

Change EM_LANAI to correspond to machine number assigned by Xinuos.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@274042 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/ELF.h b/include/llvm/Support/ELF.h
index e3c77f4a21b002eb1f86c73894b1a2ed5822958b..4da320be16976fe3659829a27b66a28edd6b4d2e 100644 (file)
--- a/include/llvm/Support/ELF.h
+++ b/include/llvm/Support/ELF.h
@@ -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.

diff --git a/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai b/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai
index c0bb9a046942cb78a784d3172034be3b20d069a8..70e25d1fca319223b9c6d923fd39633d909f8dcc 100644 (file)
Binary files a/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai and b/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai differ

diff --git a/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai b/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai
index 13bb30ca6fd9abb1c2cb970e5728a7251495722c..fe05a31e358b5fcc8f807680d120282fb13341f1 100644 (file)
Binary files a/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai and b/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai differ

diff --git a/test/tools/llvm-readobj/file-headers.test b/test/tools/llvm-readobj/file-headers.test
index 4fe8210c4dd7101c057ec4afa3758cc7cc22f258..662c9b6bd4d7b69c9cc8a4c9eba7fda3575cc7b2 100644 (file)
--- a/test/tools/llvm-readobj/file-headers.test
+++ b/test/tools/llvm-readobj/file-headers.test
@@ -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