diff options
| -rw-r--r-- | llvm/include/llvm/Support/ELF.h | 6 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai | bin | 428 -> 429 bytes | |||
| -rw-r--r-- | llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai | bin | 736 -> 737 bytes | |||
| -rw-r--r-- | llvm/test/tools/llvm-readobj/file-headers.test | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/llvm/include/llvm/Support/ELF.h b/llvm/include/llvm/Support/ELF.h index e3c77f4a21b..4da320be169 100644 --- a/llvm/include/llvm/Support/ELF.h +++ b/llvm/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/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai b/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai Binary files differindex c0bb9a04694..70e25d1fca3 100644 --- a/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai +++ b/llvm/test/tools/llvm-readobj/Inputs/relocs.obj.elf-lanai diff --git a/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai b/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai Binary files differindex 13bb30ca6fd..fe05a31e358 100644 --- a/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai +++ b/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.elf-lanai diff --git a/llvm/test/tools/llvm-readobj/file-headers.test b/llvm/test/tools/llvm-readobj/file-headers.test index 4fe8210c4dd..662c9b6bd4d 100644 --- a/llvm/test/tools/llvm-readobj/file-headers.test +++ b/llvm/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 |
