Index: include/llvm/Object/ELFObjectFile.h =================================================================== --- include/llvm/Object/ELFObjectFile.h +++ include/llvm/Object/ELFObjectFile.h @@ -41,7 +41,7 @@ namespace llvm { namespace object { -constexpr int NumElfSymbolTypes = 8; +constexpr int NumElfSymbolTypes = 16; extern const llvm::EnumEntry ElfSymbolTypes[NumElfSymbolTypes]; class elf_symbol_iterator; Index: lib/Object/ELFObjectFile.cpp =================================================================== --- lib/Object/ELFObjectFile.cpp +++ lib/Object/ELFObjectFile.cpp @@ -43,7 +43,16 @@ {"File", "FILE", ELF::STT_FILE}, {"Common", "COMMON", ELF::STT_COMMON}, {"TLS", "TLS", ELF::STT_TLS}, - {"GNU_IFunc", "IFUNC", ELF::STT_GNU_IFUNC}}; + {"Unknown(7)", ": 7", 7}, + {"Unknown(8)", ": 8", 8}, + {"Unknown(9)", ": 9", 9}, + {"GNU_IFunc", "IFUNC", ELF::STT_GNU_IFUNC}, + {"OS Specific(11)", ": 11", 11}, + {"OS Specific(12)", ": 12", 12}, + {"Proc Specific(13)", ": 13", 13}, + {"Proc Specific(14)", ": 14", 14}, + {"Proc Specific(15)", ": 15", 15} +}; ELFObjectFileBase::ELFObjectFileBase(unsigned int Type, MemoryBufferRef Source) : ObjectFile(Type, Source) {} Index: test/tools/llvm-nm/format-sysv-type.test =================================================================== --- test/tools/llvm-nm/format-sysv-type.test +++ test/tools/llvm-nm/format-sysv-type.test @@ -20,25 +20,40 @@ Type: STT_OBJECT - Name: symbol_func Type: STT_FUNC + - Name: unknown_7 + Type: 7 + - Name: unknown_8 + Type: 8 + - Name: unknown_9 + Type: 9 - Name: symbol_ifunc Type: STT_GNU_IFUNC - - Name: os_specific + - Name: os_specific_10 + Type: 10 + - Name: os_specific_11 Type: 11 - - Name: proc_specific + - Name: os_specific_12 + Type: 12 + - Name: proc_specific_13 Type: 13 - - Name: unknown - Type: 7 - -## FIXME: Should not print blank types for unknown, OS-specific and processor- -## specific types. See https://bugs.llvm.org/show_bug.cgi?id=41713. + - Name: proc_specific_14 + Type: 14 + - Name: proc_specific_15 + Type: 15 -# CHECK: os_specific {{.*}}| | | |*UND* -# CHECK-NEXT: proc_specific {{.*}}| | | |*UND* -# CHECK-NEXT: symbol_common {{.*}}| COMMON| | |*COM* -# CHECK-NEXT: symbol_file {{.*}}| FILE| | |*UND* -# CHECK-NEXT: symbol_func {{.*}}| FUNC| | |*UND* -# CHECK-NEXT: symbol_ifunc {{.*}}| IFUNC| | |*UND* -# CHECK-NEXT: symbol_notype {{.*}}| NOTYPE| | |*UND* -# CHECK-NEXT: symbol_obj {{.*}}| OBJECT| | |*UND* -# CHECK-NEXT: symbol_tls {{.*}}| TLS| | |*UND* -# CHECK-NEXT: unknown {{.*}}| | | |*UND* +# CHECK: os_specific_10 | | U | IFUNC| | |*UND* +# CHECK-NEXT: os_specific_11 | | U | : 11| | |*UND* +# CHECK-NEXT: os_specific_12 | | U | : 12| | |*UND* +# CHECK-NEXT: proc_specific_13 | | U |: 13| | |*UND* +# CHECK-NEXT: proc_specific_14 | | U |: 14| | |*UND* +# CHECK-NEXT: proc_specific_15 | | U |: 15| | |*UND* +# CHECK-NEXT: symbol_common | | U | COMMON| | |*COM* +# CHECK-NEXT: symbol_file | | U | FILE| | |*UND* +# CHECK-NEXT: symbol_func | | U | FUNC| | |*UND* +# CHECK-NEXT: symbol_ifunc | | U | IFUNC| | |*UND* +# CHECK-NEXT: symbol_notype | | U | NOTYPE| | |*UND* +# CHECK-NEXT: symbol_obj | | U | OBJECT| | |*UND* +# CHECK-NEXT: symbol_tls | | U | TLS| | |*UND* +# CHECK-NEXT: unknown_7 | | U | : 7| | |*UND* +# CHECK-NEXT: unknown_8 | | U | : 8| | |*UND* +# CHECK-NEXT: unknown_9 | | U | : 9| | |*UND* Index: test/tools/llvm-readobj/elf-symbol-types.test =================================================================== --- test/tools/llvm-readobj/elf-symbol-types.test +++ test/tools/llvm-readobj/elf-symbol-types.test @@ -22,12 +22,25 @@ # LLVM: Type: TLS # LLVM: Name: gnu_ifunc # LLVM: Type: GNU_IFunc -# LLVM: Name: os_specific -# LLVM: Type: 0xB -# LLVM: Name: proc_specific -# LLVM: Type: 0xD -# LLVM: Name: unknown -# LLVM: Type: 0x7 + +# LLVM: Name: os_specific_11 +# LLVM: Type: OS Specific(11) +# LLVM: Name: os_specific_12 +# LLVM: Type: OS Specific(12) + +# LLVM: Name: proc_specific_13 +# LLVM: Type: Proc Specific(13) +# LLVM: Name: proc_specific_14 +# LLVM: Type: Proc Specific(14) +# LLVM: Name: proc_specific_15 +# LLVM: Type: Proc Specific(15) + +# LLVM: Name: unknown_7 +# LLVM: Type: Unknown(7) +# LLVM: Name: unknown_8 +# LLVM: Type: Unknown(8) +# LLVM: Name: unknown_9 +# LLVM: Type: Unknown(9) # GNU: NOTYPE {{.*}} notype # GNU: OBJECT {{.*}} object @@ -37,9 +50,14 @@ # GNU: COMMON {{.*}} common # GNU: TLS {{.*}} tls # GNU: IFUNC {{.*}} gnu_ifunc -# GNU: b {{.*}} os_specific -# GNU: d {{.*}} proc_specific -# GNU: 7 {{.*}} unknown +# GNU: : 11 {{.*}} os_specific_11 +# GNU: : 12 {{.*}} os_specific_12 +# GNU: : 13 {{.*}} proc_specific_13 +# GNU: : 14 {{.*}} proc_specific_14 +# GNU: : 15 {{.*}} proc_specific_15 +# GNU: : 7 {{.*}} unknown_7 +# GNU: : 8 {{.*}} unknown_8 +# GNU: : 9 {{.*}} unknown_9 !ELF FileHeader: @@ -76,12 +94,27 @@ - Name: gnu_ifunc Type: STT_GNU_IFUNC Binding: STB_GLOBAL - - Name: os_specific + - Name: os_specific_11 Type: 11 Binding: STB_GLOBAL - - Name: proc_specific + - Name: os_specific_12 + Type: 12 + Binding: STB_GLOBAL + - Name: proc_specific_13 Type: 13 Binding: STB_GLOBAL - - Name: unknown + - Name: proc_specific_14 + Type: 14 + Binding: STB_GLOBAL + - Name: proc_specific_15 + Type: 15 + Binding: STB_GLOBAL + - Name: unknown_7 Type: 7 Binding: STB_GLOBAL + - Name: unknown_8 + Type: 8 + Binding: STB_GLOBAL + - Name: unknown_9 + Type: 9 + Binding: STB_GLOBAL Index: test/tools/yaml2obj/symbol-type.yaml =================================================================== --- test/tools/yaml2obj/symbol-type.yaml +++ test/tools/yaml2obj/symbol-type.yaml @@ -9,12 +9,14 @@ # CHECK: Type: Section # CHECK: Name: known_hex # CHECK: Type: Object -# CHECK: Name: unknown_hex -# CHECK: Type: 0xB + +# CHECK: Name: unknown_hex_11 +# CHECK: Type: OS Specific(11) (0xB) + # CHECK: Name: known_int # CHECK: Type: Object # CHECK: Name: unknown_int -# CHECK: Type: 0xB +# CHECK: Type: OS Specific(11) (0xB) !ELF FileHeader: @@ -38,7 +40,7 @@ - Name: known_hex Type: 0x1 Binding: STB_GLOBAL - - Name: unknown_hex + - Name: unknown_hex_11 Type: 0xb Binding: STB_GLOBAL - Name: known_int