From 041fc266abc76b93284ace7d22359c9ba40ef9cc Mon Sep 17 00:00:00 2001 From: Jacques Pienaar Date: Tue, 28 Jun 2016 18:22:22 +0000 Subject: [PATCH] [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 --- include/llvm/Support/ELF.h | 6 +----- .../llvm-readobj/Inputs/relocs.obj.elf-lanai | Bin 428 -> 429 bytes .../llvm-readobj/Inputs/trivial.obj.elf-lanai | Bin 736 -> 737 bytes test/tools/llvm-readobj/file-headers.test | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/llvm/Support/ELF.h b/include/llvm/Support/ELF.h index e3c77f4a21b0..4da320be1697 100644 --- 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 GIT binary patch delta 31 fcmZ3(yp~y{-qpvAk%^H34j37}Y!sQn$jAi%T4e<+ delta 29 dcmZ3>yoOn%-qpvAk%^H34j3DiH;T+)1OQJ81knHh 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 GIT binary patch delta 31 fcmaFB`jAzm-qpvAk%^H34j37}Y!o@e#K;8zXWRwN delta 29 dcmaFJ`hZoW-qpvAk%^H34j3DiH;SBL0svb-1#$oY diff --git a/test/tools/llvm-readobj/file-headers.test b/test/tools/llvm-readobj/file-headers.test index 4fe8210c4dd7..662c9b6bd4d7 100644 --- 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