[llvm-objdump/llvm-readobj/obj2yaml/yaml2obj] Support DT_PPC_GOT and DT_PPC_OPT

[MaskRay]

Summary

In glibc, DT_PPC_GOT indicates that PowerPC32 Secure PLT ABI is used.
I plan to use it in D62464.

DT_PPC_OPT currently indicates if a TLSDESC inspired TLS optimization is
enabled.

[grimar]

Seems you need to rebase after D62596.

[jhenderson]

test/tools/llvm-readobj/Inputs/elf-dynamic-tags-machine-specific.yaml

185–187 ↗

(On Diff #202904)

Should you add these two tags to the 64-bit PPC rather than create another document? It seems odd having the two different variations.

[MaskRay]

Update all 4 tools at the same time.

[MaskRay]

test/tools/llvm-readobj/Inputs/elf-dynamic-tags-machine-specific.yaml

185–187 ↗

(On Diff #202904)

I have to add a new document. ppc32 and ppc64 have different e_machine values. The two tags are not available on ppc64. Actually, there is a conflict:DT_PPC64_GLINK == DT_PPC_GOT.

[MaskRay]

Rebase after D62596

[jhenderson]

test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test

69 ↗

(On Diff #202916)

If you're adding the extra '#' here, please also add it to the other cases in this file.

78 ↗

(On Diff #202916)

Delete this line (or at least the '#')

test/tools/llvm-readobj/elf-dynamic-tags-machine-specific.test

135 ↗

(On Diff #202916)

PPC32 -> PPC?

[MaskRay]

Address review comments and fix a rebase issue

[grimar]

LGTM

[jhenderson]

LGTM.

llvm/trunk/include/llvm/BinaryFormat/DynamicTags.def

 #define HEXAGON_DYNAMIC_TAG_DEFINED
 #endif
 
 #ifndef MIPS_DYNAMIC_TAG
 #define MIPS_DYNAMIC_TAG(name, value) DYNAMIC_TAG(name, value)
 #define MIPS_DYNAMIC_TAG_DEFINED
 #endif
 
+#ifndef PPC_DYNAMIC_TAG
+#define PPC_DYNAMIC_TAG(name, value) DYNAMIC_TAG(name, value)
+#define PPC_DYNAMIC_TAG_DEFINED
+#endif
+
 #ifndef PPC64_DYNAMIC_TAG
 #define PPC64_DYNAMIC_TAG(name, value) DYNAMIC_TAG(name, value)
 #define PPC64_DYNAMIC_TAG_DEFINED
 #endif
 
 #ifndef DYNAMIC_TAG_MARKER
 #define DYNAMIC_TAG_MARKER(name, value) DYNAMIC_TAG(name, value)
 #define DYNAMIC_TAG_MARKER_DEFINED

 MIPS_DYNAMIC_TAG(MIPS_GP_VALUE, 0x70000030)     // GP value for auxiliary GOTs.
 MIPS_DYNAMIC_TAG(MIPS_AUX_DYNAMIC, 0x70000031)  // Address of auxiliary .dynamic.
 MIPS_DYNAMIC_TAG(MIPS_PLTGOT, 0x70000032)       // Address of the base of the PLTGOT.
 MIPS_DYNAMIC_TAG(MIPS_RWPLT, 0x70000034)        // Points to the base
                                                 // of a writable PLT.
 MIPS_DYNAMIC_TAG(MIPS_RLD_MAP_REL, 0x70000035)  // Relative offset of run time loader
                                                 // map, used for debugging.
 
+// PPC specific dynamic table entries.
+PPC_DYNAMIC_TAG(PPC_GOT, 0x70000000) // Uses Secure PLT ABI.
+PPC_DYNAMIC_TAG(PPC_OPT, 0x70000001) // Has TLS optimization.
+
 // PPC64 specific dynamic table entries.
 PPC64_DYNAMIC_TAG(PPC64_GLINK, 0x70000000) // Address of 32 bytes before the
                                            // first glink lazy resolver stub.
 
 // Sun machine-independent extensions.
 DYNAMIC_TAG(AUXILIARY, 0x7FFFFFFD) // Shared object to load before self
 DYNAMIC_TAG(USED, 0x7FFFFFFE)      // Same as DT_NEEDED
 DYNAMIC_TAG(FILTER, 0x7FFFFFFF)    // Shared object to get values from

 #ifdef MIPS_DYNAMIC_TAG_DEFINED
 #undef MIPS_DYNAMIC_TAG
 #undef MIPS_DYNAMIC_TAG_DEFINED
 #endif
 #ifdef HEXAGON_DYNAMIC_TAG_DEFINED
 #undef HEXAGON_DYNAMIC_TAG
 #undef HEXAGON_DYNAMIC_TAG_DEFINED
 #endif
+#ifdef PPC_DYNAMIC_TAG_DEFINED
+#undef PPC_DYNAMIC_TAG
+#undef PPC_DYNAMIC_TAG_DEFINED
+#endif
 #ifdef PPC64_DYNAMIC_TAG_DEFINED
 #undef PPC64_DYNAMIC_TAG
 #undef PPC64_DYNAMIC_TAG_DEFINED
 #endif

llvm/trunk/lib/ObjectYAML/ELFYAML.cpp

void ScalarEnumerationTraits<ELFYAML::ELF_DYNTAG>::enumeration(
     IO &IO, ELFYAML::ELF_DYNTAG &Value) {
   const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
   assert(Object && "The IO context is not initialized");
 
 // Disable architecture specific tags by default. We might enable them below.
 #define AARCH64_DYNAMIC_TAG(name, value)
 #define MIPS_DYNAMIC_TAG(name, value)
 #define HEXAGON_DYNAMIC_TAG(name, value)
+#define PPC_DYNAMIC_TAG(name, value)
 #define PPC64_DYNAMIC_TAG(name, value)
 // Ignore marker tags such as DT_HIOS (maps to DT_VERNEEDNUM), etc.
 #define DYNAMIC_TAG_MARKER(name, value)
 
 #define STRINGIFY(X) (#X)
 #define DYNAMIC_TAG(X, Y) IO.enumCase(Value, STRINGIFY(DT_##X), ELF::DT_##X);
   switch (Object->Header.Machine) {
   case ELF::EM_AARCH64:
#define MIPS_DYNAMIC_TAG(name, value)
     break;
   case ELF::EM_HEXAGON:
 #undef HEXAGON_DYNAMIC_TAG
 #define HEXAGON_DYNAMIC_TAG(name, value) DYNAMIC_TAG(name, value)
 #include "llvm/BinaryFormat/DynamicTags.def"
 #undef HEXAGON_DYNAMIC_TAG
 #define HEXAGON_DYNAMIC_TAG(name, value)
     break;
+  case ELF::EM_PPC:
+#undef PPC_DYNAMIC_TAG
+#define PPC_DYNAMIC_TAG(name, value) DYNAMIC_TAG(name, value)
+#include "llvm/BinaryFormat/DynamicTags.def"
+#undef PPC_DYNAMIC_TAG
+#define PPC_DYNAMIC_TAG(name, value)
+    break;
   case ELF::EM_PPC64:
 #undef PPC64_DYNAMIC_TAG
 #define PPC64_DYNAMIC_TAG(name, value) DYNAMIC_TAG(name, value)
 #include "llvm/BinaryFormat/DynamicTags.def"
 #undef PPC64_DYNAMIC_TAG
 #define PPC64_DYNAMIC_TAG(name, value)
     break;
   default:
 #include "llvm/BinaryFormat/DynamicTags.def"
     break;
   }
 #undef AARCH64_DYNAMIC_TAG
 #undef MIPS_DYNAMIC_TAG
 #undef HEXAGON_DYNAMIC_TAG
+#undef PPC_DYNAMIC_TAG
 #undef PPC64_DYNAMIC_TAG
 #undef DYNAMIC_TAG_MARKER
 #undef STRINGIFY
 #undef DYNAMIC_TAG
 
   IO.enumFallback<Hex64>(Value);
 }
 

llvm/trunk/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test

-# Test that hexagon machine-specific tags can be dumped.
+## Test that hexagon machine-specific tags can be dumped.
 # RUN: yaml2obj --docnum=1 -o %t.hex \
 # RUN:          %S/../llvm-readobj/Inputs/elf-dynamic-tags-machine-specific.yaml
 # RUN: llvm-objdump -p %t.hex | FileCheck %s --check-prefix=HEXAGON
 
 # HEXAGON:      Dynamic Section:
 # HEXAGON-NEXT:   HASH                 0x0000000000001000
 # HEXAGON-NEXT:   HEXAGON_SYMSZ        0x0000000000000010
 # HEXAGON-NEXT:   HEXAGON_VER          0x0000000000001000
 # HEXAGON-NEXT:   HEXAGON_PLT          0x0000000000001000
 # HEXAGON-NEXT:   <unknown:>0x1234abcd 0x0000000000000001
 
 
-# Test that MIPS machine-specific tags can be dumped.
+## Test that MIPS machine-specific tags can be dumped.
 # RUN: yaml2obj --docnum=2 -o %t.mips \
 # RUN:          %S/../llvm-readobj/Inputs/elf-dynamic-tags-machine-specific.yaml
 # RUN: llvm-objdump -p %t.mips | FileCheck %s --check-prefix=MIPS
 
 # MIPS:      Dynamic Section:
 # MIPS-NEXT:   HASH                 0x0000000000001000
 # MIPS-NEXT:   MIPS_RLD_VERSION     0x0000000012345678
 # MIPS-NEXT:   MIPS_TIME_STAMP      0x0000000011223344

 # MIPS-NEXT:   MIPS_GP_VALUE        0x0000000000000001
 # MIPS-NEXT:   MIPS_AUX_DYNAMIC     0x0000000000001000
 # MIPS-NEXT:   MIPS_PLTGOT          0x0000000000001000
 # MIPS-NEXT:   MIPS_RWPLT           0x0000000000001000
 # MIPS-NEXT:   MIPS_RLD_MAP_REL     0x0000000000001000
 # MIPS-NEXT:   <unknown:>0x1234abcd 0x0000000000000001
 
 
-# Test that PPC64 machine-specific tags can be dumped.
+## Test that PPC machine-specific tags can be dumped.
 # RUN: yaml2obj --docnum=3 -o %t.ppc \
 # RUN:          %S/../llvm-readobj/Inputs/elf-dynamic-tags-machine-specific.yaml
 # RUN: llvm-objdump -p %t.ppc | FileCheck %s --check-prefix=PPC
 
 # PPC:      Dynamic Section:
-# PPC-NEXT:   HASH                 0x0000000000001000
-# PPC-NEXT:   PPC64_GLINK          0x0000000000001000
-# PPC-NEXT:   <unknown:>0x1234abcd 0x0000000000000001
+# PPC-NEXT:   PPC_GOT              0x000200c0
+# PPC-NEXT:   PPC_OPT              0x00000001
+# PPC-NEXT:   <unknown:>0x1234abcd 0x00000001
+
+
+## Test that PPC64 machine-specific tags can be dumped.
+# RUN: yaml2obj --docnum=4 -o %t.ppc64 \
+# RUN:          %S/../llvm-readobj/Inputs/elf-dynamic-tags-machine-specific.yaml
+# RUN: llvm-objdump -p %t.ppc64 | FileCheck %s --check-prefix=PPC64
+
+# PPC64:      Dynamic Section:
+# PPC64-NEXT:   HASH                 0x0000000000001000
+# PPC64-NEXT:   PPC64_GLINK          0x0000000000001000
+# PPC64-NEXT:   <unknown:>0x1234abcd 0x0000000000000001

llvm/trunk/test/tools/llvm-readobj/Inputs/elf-dynamic-tags-machine-specific.yaml

- Type: PT_LOAD
     Sections:
       - Section: .dynstr
       - Section: .dynamic
   - Type: PT_DYNAMIC
     VAddr: 0x1010
     Sections:
       - Section: .dynamic
 
-# Third document: PPC64
+# Third document: PPC
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2MSB
+  Type:    ET_EXEC
+  Machine: EM_PPC
+Sections:
+  - Name:    .dynstr
+    Type:    SHT_STRTAB
+    Address: 0x200
+    Size:    0x10
+    Content: "004400550066007700"
+  - Name:    .dynamic
+    Type:    SHT_DYNAMIC
+    Address: 0x20000
+    Entries:
+      - Tag:   DT_PPC_GOT
+        Value: 0x200c0
+      - Tag:   DT_PPC_OPT
+        Value: 1
+      - Tag:   0x1234abcd
+        Value: 0x1
+      - Tag:   DT_NULL
+        Value: 0
+ProgramHeaders:
+  - Type: PT_LOAD
+    VAddr: 0x1000
+    Sections:
+      - Section: .dynstr
+      - Section: .dynamic
+  - Type: PT_DYNAMIC
+    VAddr: 0x20000
+    Sections:
+      - Section: .dynamic
+
+# Fourth document: PPC64
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_PPC64
 Sections:
   - Name:    .dynstr

llvm/trunk/test/tools/llvm-readobj/elf-dynamic-tags-machine-specific.test

 # GNU-MIPS-NEXT:   0x0000000070000031 (MIPS_AUX_DYNAMIC)   0x1000
 # GNU-MIPS-NEXT:   0x0000000070000032 (MIPS_PLTGOT)        0x1000
 # GNU-MIPS-NEXT:   0x0000000070000034 (MIPS_RWPLT)         0x1000
 # GNU-MIPS-NEXT:   0x0000000070000035 (MIPS_RLD_MAP_REL)   0x1000
 # GNU-MIPS-NEXT:   0x000000001234abcd (unknown)            0x1
 # GNU-MIPS-NEXT:   0x0000000000000000 (NULL)               0x0
 
 
-# Test that PPC64 machine-specific tags can be dumped.
+# Test that PPC machine-specific tags can be dumped.
 # RUN: yaml2obj --docnum=3 %S/Inputs/elf-dynamic-tags-machine-specific.yaml -o %t.ppc
 # RUN: llvm-readobj --dynamic-table %t.ppc | FileCheck %s --check-prefix=LLVM-PPC
 # RUN: llvm-readelf --dynamic-table %t.ppc | FileCheck %s --check-prefix=GNU-PPC
 
 # LLVM-PPC:      DynamicSection [ (4 entries)
-# LLVM-PPC-NEXT:   Tag                Type                 Name/Value
-# LLVM-PPC-NEXT:   0x0000000000000004 HASH                 0x1000
-# LLVM-PPC-NEXT:   0x0000000070000000 PPC64_GLINK          0x1000
-# LLVM-PPC-NEXT:   0x000000001234ABCD unknown              0x1
-# LLVM-PPC-NEXT:   0x0000000000000000 NULL                 0x0
+# LLVM-PPC-NEXT:   Tag        Type                 Name/Value
+# LLVM-PPC-NEXT:   0x70000000 PPC_GOT              0x200C0
+# LLVM-PPC-NEXT:   0x70000001 PPC_OPT              0x1
+# LLVM-PPC-NEXT:   0x1234ABCD unknown              0x1
+# LLVM-PPC-NEXT:   0x00000000 NULL                 0x0
 # LLVM-PPC-NEXT: ]
 
 # GNU-PPC:      Dynamic section at offset {{.*}} contains 4 entries:
-# GNU-PPC-NEXT:   Tag                Type                 Name/Value
-# GNU-PPC-NEXT:   0x0000000000000004 (HASH)               0x1000
-# GNU-PPC-NEXT:   0x0000000070000000 (PPC64_GLINK)        0x1000
-# GNU-PPC-NEXT:   0x000000001234abcd (unknown)            0x1
-# GNU-PPC-NEXT:   0x0000000000000000 (NULL)               0x0
+# GNU-PPC-NEXT:   Tag        Type                 Name/Value
+# GNU-PPC-NEXT:   0x70000000 (PPC_GOT)            0x200c0
+# GNU-PPC-NEXT:   0x70000001 (PPC_OPT)            0x1
+# GNU-PPC-NEXT:   0x1234abcd (unknown)            0x1
+# GNU-PPC-NEXT:   0x00000000 (NULL)               0x0
+
+
+# Test that PPC64 machine-specific tags can be dumped.
+# RUN: yaml2obj --docnum=4 %S/Inputs/elf-dynamic-tags-machine-specific.yaml -o %t.ppc64
+# RUN: llvm-readobj --dynamic-table %t.ppc64 | FileCheck %s --check-prefix=LLVM-PPC64
+# RUN: llvm-readelf --dynamic-table %t.ppc64 | FileCheck %s --check-prefix=GNU-PPC64
+
+# LLVM-PPC64:      DynamicSection [ (4 entries)
+# LLVM-PPC64-NEXT:   Tag                Type                 Name/Value
+# LLVM-PPC64-NEXT:   0x0000000000000004 HASH                 0x1000
+# LLVM-PPC64-NEXT:   0x0000000070000000 PPC64_GLINK          0x1000
+# LLVM-PPC64-NEXT:   0x000000001234ABCD unknown              0x1
+# LLVM-PPC64-NEXT:   0x0000000000000000 NULL                 0x0
+# LLVM-PPC64-NEXT: ]
+
+# GNU-PPC64:      Dynamic section at offset {{.*}} contains 4 entries:
+# GNU-PPC64-NEXT:   Tag                Type                 Name/Value
+# GNU-PPC64-NEXT:   0x0000000000000004 (HASH)               0x1000
+# GNU-PPC64-NEXT:   0x0000000070000000 (PPC64_GLINK)        0x1000
+# GNU-PPC64-NEXT:   0x000000001234abcd (unknown)            0x1
+# GNU-PPC64-NEXT:   0x0000000000000000 (NULL)               0x0
 
 # Test that AARCH64 machine-specific tags can be dumped.
-# RUN: yaml2obj --docnum=4 %S/Inputs/elf-dynamic-tags-machine-specific.yaml -o %t.aarch64
+# RUN: yaml2obj --docnum=5 %S/Inputs/elf-dynamic-tags-machine-specific.yaml -o %t.aarch64
 # RUN: llvm-readobj --dynamic-table %t.aarch64 | FileCheck %s --check-prefix=LLVM-AARCH64
 # RUN: llvm-readelf --dynamic-table %t.aarch64 | FileCheck %s --check-prefix=GNU-AARCH64
 
 # LLVM-AARCH64:     DynamicSection [ (5 entries)
 # LLVM-AARCH64-NEXT:  Tag                Type                 Name/Value
 # LLVM-AARCH64-NEXT:  0x0000000000000004 HASH                 0x1000
 # LLVM-AARCH64-NEXT:  0x0000000070000001 AARCH64_BTI_PLT      0
 # LLVM-AARCH64-NEXT:  0x0000000070000003 AARCH64_PAC_PLT      0

llvm/trunk/test/tools/obj2yaml/dynamic-section-arch-tags.test

- Name:            .dynamic
     Entries:
       - Tag:             DT_HEXAGON_SYMSZ
         Value:           0x0000000000000001
       - Tag:             DT_HEXAGON_VER
         Value:           0x0000000000000002
       - Tag:             DT_HEXAGON_PLT
         Value:           0x0000000000000003
 
-## Check we can handle PPC64 specific tags.
+## Check we can handle PPC specific tags.
 # RUN: yaml2obj -docnum=3 %s -o %t3
-# RUN: obj2yaml %t3 | FileCheck %s --check-prefix=EM_PPC64
+# RUN: obj2yaml %t3 | FileCheck %s --check-prefix=EM_PPC
+
+# EM_PPC:      - Tag:             DT_PPC_GOT
+# EM_PPC-NEXT:   Value:           0x0000000000020000
+# EM_PPC-NEXT: - Tag:             DT_PPC_OPT
+# EM_PPC-NEXT:   Value:           0x0000000000000001
+
+--- !ELF
+FileHeader:
+  Class:             ELFCLASS32
+  Data:              ELFDATA2MSB
+  Type:              ET_REL
+  Machine:           EM_PPC
+Sections:
+  - Name:            .dynamic
+    Type:            SHT_DYNAMIC
+    Entries:
+      - Tag:             DT_PPC_GOT
+        Value:           0x0000000000020000
+      - Tag:             DT_PPC_OPT
+        Value:           0x0000000000000001
+
+## Check we can handle PPC64 specific tags.
+# RUN: yaml2obj -docnum=4 %s -o %t4
+# RUN: obj2yaml %t4 | FileCheck %s --check-prefix=EM_PPC64
 
 # EM_PPC64:      - Tag:             DT_PPC64_GLINK
 # EM_PPC64-NEXT:   Value:           0x0000000000000001
 
 --- !ELF
 FileHeader:
   Class:             ELFCLASS64
   Data:              ELFDATA2LSB
   Type:              ET_REL
   Machine:           EM_PPC64
 Sections:
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Entries:
       - Tag:             DT_PPC64_GLINK
         Value:           0x0000000000000001
 
 ## Check we can handle AARCH64 specific tags.
-# RUN: yaml2obj -docnum=4 %s -o %t2
+# RUN: yaml2obj -docnum=5 %s -o %t2
 # RUN: obj2yaml %t2 | FileCheck %s --check-prefix=AARCH64
 
 # AARCH64:      - Tag:             DT_AARCH64_BTI_PLT
 # AARCH64-NEXT:   Value:           0x0000000000000000
 # AARCH64-NEXT: - Tag:             DT_AARCH64_PAC_PLT
 # AARCH64-NEXT:   Value:           0x0000000000000000
 
 --- !ELF
Entries:
       - Tag:             DT_AARCH64_PAC_PLT
         Value:           0x0000000000000000
 
 ## Check we can't use a tag from a different architecture,
 ## even if it has the same numeric value as a valid tag.
 ## Here for EM_PPC64 we are trying to use DT_HEXAGON_SYMSZ
 ## instead of DT_PPC64_GLINK. They both have value of 0x70000000.
 
-# RUN: not yaml2obj -docnum=5 %s 2>&1 | FileCheck %s --check-prefix=ERR
+# RUN: not yaml2obj -docnum=6 %s 2>&1 | FileCheck %s --check-prefix=ERR
 # ERR:      error: invalid hex64 number
 # ERR-NEXT: - Tag: DT_HEXAGON_SYMSZ
 
 --- !ELF
 FileHeader:
   Class:             ELFCLASS64
   Data:              ELFDATA2LSB
   Type:              ET_REL
   Machine:           EM_PPC64
 Sections:
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Entries:
       - Tag:             DT_HEXAGON_SYMSZ
         Value:           0x0000000000000001