[llvm-readobj/llvm-readelf] - Improve dumping of versioning sections.

[grimar]

Summary

Our elf-versioninfo.test is not perfect. It does not properly test how
flags are dumped and also we have a bug: they are dumped as enums in
LLVM style now, i.e not dumped properly.

GNU style uses a versionFlagToString method to build a string from flags
which seems is consistent with GNU readelf.

In this patch I fixed the issues mentioned.

[grimar]

• Last minute fix.

[grimar]

• Seems I've forgot to fix a one of LLD tests. Now it is fixed.

[ruiu]

LGTM

[MaskRay]

I agree that making the field an enumeration is an improvement, but I also feel that the closing bracket ] on a different line is a bit verbose.

Ideally we can make it on one line, e.g. Flags [], Flags [ Info (0x4), 0x8] (0x8 is an unspecified bit field. Bikeshedding on the representation welcomed!)

[ruiu]

In D70399#1752600, @MaskRay wrote:

I agree that making the field an enumeration is an improvement, but I also feel that the closing bracket ] on a different line is a bit verbose.

Ideally we can make it on one line, e.g. Flags [], Flags [ Info (0x4), 0x8] (0x8 is an unspecified bit field. Bikeshedding on the representation welcomed!)

I agree with you that the new output looks a bit too verbose but I'd keep it consistent with other flags, as the output is in many cases consumed by programs than humans.

lld/test/ELF/verdef-defaultver.s

 # DSO-NEXT:    Symbol {
 # DSO-NEXT:      Version: 3
 # DSO-NEXT:      Name: c@@V2
 # DSO-NEXT:    }
 # DSO-NEXT:  ]
 # DSO-NEXT:  VersionDefinitions [
 # DSO-NEXT:    Definition {
 # DSO-NEXT:      Version: 1
-# DSO-NEXT:      Flags: Base
+# DSO-NEXT:      Flags [ (0x1)
+# DSO-NEXT:        Base (0x1)
+# DSO-NEXT:      ]
 # DSO-NEXT:      Index: 1
 # DSO-NEXT:      Hash: 127830196
 # DSO-NEXT:      Name: shared
 # DSO-NEXT:    }
 # DSO-NEXT:    Definition {
 # DSO-NEXT:      Version: 1
-# DSO-NEXT:      Flags: 0x0
+# DSO-NEXT:      Flags [ (0x0)
+# DSO-NEXT:      ]
 # DSO-NEXT:      Index: 2
 # DSO-NEXT:      Hash: 1425
 # DSO-NEXT:      Name: V1
 # DSO-NEXT:    }
 # DSO-NEXT:    Definition {
 # DSO-NEXT:      Version: 1
-# DSO-NEXT:      Flags: 0x0
+# DSO-NEXT:      Flags [ (0x0)
+# DSO-NEXT:      ]
 # DSO-NEXT:      Index: 3
 # DSO-NEXT:      Hash: 1426
 # DSO-NEXT:      Name: V2
 # DSO-NEXT:    }
 # DSO-NEXT:  ]
 
 ## Check that we can link against DSO produced.
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2

 # EXE-NEXT:  VersionRequirements [
 # EXE-NEXT:    Dependency {
 # EXE-NEXT:      Version: 1
 # EXE-NEXT:      Count: 2
 # EXE-NEXT:      FileName: shared
 # EXE-NEXT:      Entries [
 # EXE-NEXT:        Entry {
 # EXE-NEXT:          Hash: 1425
-# EXE-NEXT:          Flags: 0x0
+# EXE-NEXT:          Flags [ (0x0)
+# EXE-NEXT:          ]
 # EXE-NEXT:          Index: 2
 # EXE-NEXT:          Name: V1
 # EXE-NEXT:        }
 # EXE-NEXT:        Entry {
 # EXE-NEXT:          Hash: 1426
-# EXE-NEXT:          Flags: 0x0
+# EXE-NEXT:          Flags [ (0x0)
+# EXE-NEXT:          ]
 # EXE-NEXT:          Index: 3
 # EXE-NEXT:          Name: V2
 # EXE-NEXT:        }
 # EXE-NEXT:      ]
 # EXE-NEXT:    }
 # EXE-NEXT:  ]
 
 .globl _start
 _start:
   .long a - .
   .long b - .
   .long c - .

lld/test/ELF/verdef-dependency.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: echo "LIBSAMPLE_1.0 { global: a; local: *; };" > %t.script
 # RUN: echo "LIBSAMPLE_2.0 { global: b; local: *; } LIBSAMPLE_1.0;" >> %t.script
 # RUN: echo "LIBSAMPLE_3.0 { global: c; } LIBSAMPLE_2.0;" >> %t.script
 # RUN: ld.lld --version-script %t.script -shared -soname shared %t.o -o %t.so
 # RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
 # DSO:      VersionDefinitions [
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
-# DSO-NEXT:     Flags: Base
+# DSO-NEXT:     Flags [ (0x1)
+# DSO-NEXT:       Base (0x1)
+# DSO-NEXT:     ]
 # DSO-NEXT:     Index: 1
 # DSO-NEXT:     Hash: 127830196
 # DSO-NEXT:     Name: shared
 # DSO-NEXT:   }
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
-# DSO-NEXT:     Flags: 0x0
+# DSO-NEXT:     Flags [ (0x0)
+# DSO-NEXT:     ]
 # DSO-NEXT:     Index: 2
 # DSO-NEXT:     Hash: 98457184
 # DSO-NEXT:     Name: LIBSAMPLE_1.0
 # DSO-NEXT:   }
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
-# DSO-NEXT:     Flags: 0x0
+# DSO-NEXT:     Flags [ (0x0)
+# DSO-NEXT:     ]
 # DSO-NEXT:     Index: 3
 # DSO-NEXT:     Hash: 98456416
 # DSO-NEXT:     Name: LIBSAMPLE_2.0
 # DSO-NEXT:   }
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
-# DSO-NEXT:     Flags: 0x0
+# DSO-NEXT:     Flags [ (0x0)
+# DSO-NEXT:     ]
 # DSO-NEXT:     Index: 4
 # DSO-NEXT:     Hash: 98456672
 # DSO-NEXT:     Name: LIBSAMPLE_3.0
 # DSO-NEXT:   }
 # DSO-NEXT: ]

lld/test/ELF/verdef.s

 # DSO-NEXT:   Symbol {
 # DSO-NEXT:     Version: 4
 # DSO-NEXT:     Name: c@@LIBSAMPLE_3.0
 # DSO-NEXT:   }
 # DSO-NEXT: ]
 # DSO-NEXT: VersionDefinitions [
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
-# DSO-NEXT:     Flags: Base
+# DSO-NEXT:     Flags [ (0x1)
+# DSO-NEXT:       Base (0x1)
+# DSO-NEXT:     ]
 # DSO-NEXT:     Index: 1
 # DSO-NEXT:     Hash: 127830196
 # DSO-NEXT:     Name: shared
 # DSO-NEXT:   }
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
-# DSO-NEXT:     Flags: 0x0
+# DSO-NEXT:     Flags [ (0x0)
+# DSO-NEXT:     ]
 # DSO-NEXT:     Index: 2
 # DSO-NEXT:     Hash: 98457184
 # DSO-NEXT:     Name: LIBSAMPLE_1.0
 # DSO-NEXT:   }
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
-# DSO-NEXT:     Flags: 0x0
+# DSO-NEXT:     Flags [ (0x0)
+# DSO-NEXT:     ]
 # DSO-NEXT:     Index: 3
 # DSO-NEXT:     Hash: 98456416
 # DSO-NEXT:     Name: LIBSAMPLE_2.0
 # DSO-NEXT:   }
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
-# DSO-NEXT:     Flags: 0x0
+# DSO-NEXT:     Flags [ (0x0)
+# DSO-NEXT:     ]
 # DSO-NEXT:     Index: 4
 # DSO-NEXT:     Hash: 98456672
 # DSO-NEXT:     Name: LIBSAMPLE_3.0
 # DSO-NEXT:   }
 # DSO-NEXT: ]
 # DSO-NEXT: VersionRequirements [
 # DSO-NEXT: ]
 

lld/test/ELF/verneed.s

 # CHECK-NEXT:  VersionRequirements [
 # CHECK-NEXT:    Dependency {
 # CHECK-NEXT:      Version: 1
 # CHECK-NEXT:      Count: 2
 # CHECK-NEXT:      FileName: verneed1.so.0
 # CHECK-NEXT:      Entries [
 # CHECK-NEXT:        Entry {
 # CHECK-NEXT:          Hash: 1938
-# CHECK-NEXT:          Flags: 0x0
+# CHECK-NEXT:          Flags [ (0x0)
+# CHECK-NEXT:          ]
 # CHECK-NEXT:          Index: 3
 # CHECK-NEXT:          Name: v2
 # CHECK-NEXT:        }
 # CHECK-NEXT:        Entry {
 # CHECK-NEXT:          Hash: 1939
-# CHECK-NEXT:          Flags: 0x0
+# CHECK-NEXT:          Flags [ (0x0)
+# CHECK-NEXT:          ]
 # CHECK-NEXT:          Index: 2
 # CHECK-NEXT:          Name: v3
 # CHECK-NEXT:        }
 # CHECK-NEXT:      ]
 # CHECK-NEXT:    }
 # CHECK-NEXT:    Dependency {
 # CHECK-NEXT:      Version: 1
 # CHECK-NEXT:      Count: 1
 # CHECK-NEXT:      FileName: verneed2.so.0
 # CHECK-NEXT:      Entries [
 # CHECK-NEXT:        Entry {
 # CHECK-NEXT:          Hash: 1937
-# CHECK-NEXT:          Flags: 0x0
+# CHECK-NEXT:          Flags [ (0x0)
+# CHECK-NEXT:          ]
 # CHECK-NEXT:          Index: 4
 # CHECK-NEXT:          Name: v1
 # CHECK-NEXT:        }
 # CHECK-NEXT:      ]
 # CHECK-NEXT:    }
 # CHECK-NEXT:  ]
 
 .globl _start
 _start:
 call f1@plt
 call f2@plt
 call g1@plt

llvm/test/tools/llvm-readobj/elf-invalid-versioning.test

 # LLVM-VERNEED-NAME:      VersionRequirements [
 # LLVM-VERNEED-NAME-NEXT:   Dependency {
 # LLVM-VERNEED-NAME-NEXT:     Version: 1
 # LLVM-VERNEED-NAME-NEXT:     Count: 1
 # LLVM-VERNEED-NAME-NEXT:     FileName: somefile
 # LLVM-VERNEED-NAME-NEXT:     Entries [
 # LLVM-VERNEED-NAME-NEXT:       Entry {
 # LLVM-VERNEED-NAME-NEXT:         Hash:  0
-# LLVM-VERNEED-NAME-NEXT:         Flags: 0x0
+# LLVM-VERNEED-NAME-NEXT:         Flags [ (0x0)
+# LLVM-VERNEED-NAME-NEXT:         ]
 # LLVM-VERNEED-NAME-NEXT:         Index: 2
 # LLVM-VERNEED-NAME-NEXT:         Name: {{$}}
 # LLVM-VERNEED-NAME-NEXT:       }
 # LLVM-VERNEED-NAME-NEXT:     ]
 # LLVM-VERNEED-NAME-NEXT:   }
 # LLVM-VERNEED-NAME-NEXT: ]
 
 --- !ELF

 # LLVM-NOLINK:      VersionRequirements [
 # LLVM-NOLINK-NEXT:   Dependency {
 # LLVM-NOLINK-NEXT:     Version: 1
 # LLVM-NOLINK-NEXT:     Count: 1
 # LLVM-NOLINK-NEXT:     FileName: <invalid>
 # LLVM-NOLINK-NEXT:     Entries [
 # LLVM-NOLINK-NEXT:       Entry {
 # LLVM-NOLINK-NEXT:         Hash: 0
-# LLVM-NOLINK-NEXT:         Flags: 0
+# LLVM-NOLINK-NEXT:         Flags [ (0x0)
+# LLVM-NOLINK-NEXT:         ]
 # LLVM-NOLINK-NEXT:         Index: 2
 # LLVM-NOLINK-NEXT:         Name: <invalid>
 # LLVM-NOLINK-NEXT:       }
 # LLVM-NOLINK-NEXT:     ]
 # LLVM-NOLINK-NEXT:   }
 # LLVM-NOLINK-NEXT: ]
 
 --- !ELF

 # LLVM-OFFSET-EQ:      VersionRequirements [
 # LLVM-OFFSET-EQ-NEXT:   Dependency {
 # LLVM-OFFSET-EQ-NEXT:     Version: 1
 # LLVM-OFFSET-EQ-NEXT:     Count: 1
 # LLVM-OFFSET-EQ-NEXT:     FileName: <invalid>
 # LLVM-OFFSET-EQ-NEXT:     Entries [
 # LLVM-OFFSET-EQ-NEXT:       Entry {
 # LLVM-OFFSET-EQ-NEXT:         Hash: 0
-# LLVM-OFFSET-EQ-NEXT:         Flags: 0x0
+# LLVM-OFFSET-EQ-NEXT:         Flags [ (0x0)
+# LLVM-OFFSET-EQ-NEXT:         ]
 # LLVM-OFFSET-EQ-NEXT:         Index: 0
 # LLVM-OFFSET-EQ-NEXT:         Name: <invalid>
 # LLVM-OFFSET-EQ-NEXT:       }
 # LLVM-OFFSET-EQ-NEXT:     ]
 # LLVM-OFFSET-EQ-NEXT:   }
 # LLVM-OFFSET-EQ-NEXT: ]
 
 # GNU-OFFSET-EQ:      Version needs section '.gnu.version_r' contains 1 entries:

 # LLVM-OFFSET-GR:      VersionRequirements [
 # LLVM-OFFSET-GR-NEXT:   Dependency {
 # LLVM-OFFSET-GR-NEXT:     Version: 1
 # LLVM-OFFSET-GR-NEXT:     Count: 1
 # LLVM-OFFSET-GR-NEXT:     FileName: <invalid>
 # LLVM-OFFSET-GR-NEXT:     Entries [
 # LLVM-OFFSET-GR-NEXT:       Entry {
 # LLVM-OFFSET-GR-NEXT:         Hash: 0
-# LLVM-OFFSET-GR-NEXT:         Flags: 0x0
+# LLVM-OFFSET-GR-NEXT:         Flags [ (0x0)
+# LLVM-OFFSET-GR-NEXT:         ]
 # LLVM-OFFSET-GR-NEXT:         Index: 0
 # LLVM-OFFSET-GR-NEXT:         Name: <invalid>
 # LLVM-OFFSET-GR-NEXT:       }
 # LLVM-OFFSET-GR-NEXT:     ]
 # LLVM-OFFSET-GR-NEXT:   }
 # LLVM-OFFSET-GR-NEXT: ]
 
 # GNU-OFFSET-GR:      Version needs section '.gnu.version_r' contains 1 entries:

llvm/test/tools/llvm-readobj/elf-versioninfo.test

-## Test that llvm-readobj dumps version info tags correctly.
+## Test how llvm-readobj/llvm-readelf tools dump versioning sections.
 
 # RUN: yaml2obj %s --docnum=1 -o %t1
 # RUN: llvm-readobj -V %t1 | FileCheck %s --check-prefix=LLVM
 # RUN: llvm-readelf -V %t1 | FileCheck %s --check-prefix=GNU
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
- Name:         .gnu.version
     AddressAlign: 0x0000000000000002
     EntSize:      0x0000000000000002
     Entries:      [ 0, 2, 3, 4, 5, 6]
   - Name:         .gnu.version_d
     Type:         SHT_GNU_verdef
     Flags:        [ SHF_ALLOC ]
     Link:         .dynstr
     AddressAlign: 0x0000000000000004
-    Info:         0x0000000000000003
+    Info:         0x0000000000000006
     Entries:
       - Version:    1
         Flags:      0
+        VersionNdx: 0
+        Hash:       0
+        Names:
+          - VERSION1
+      - Version:    1
+        Flags:      1
+        VersionNdx: 0
+        Hash:       0
+        Names:
+          - VERSION1
+      - Version:    1
+        Flags:      2
+        VersionNdx: 0
+        Hash:       0
+        Names:
+          - VERSION1
+      - Version:    1
+        Flags:      4
+        VersionNdx: 0
+        Hash:       0
+        Names:
+          - VERSION1
+      - Version:    1
+        Flags:      7
         VersionNdx: 2
         Hash:       175630257
         Names:
           - VERSION1
       - Version:    1
-        Flags:      0
+        Flags:      8
         VersionNdx: 3
         Hash:       175630258
         Names:
           - VERSION2
           - VERSION1
   - Name:         .gnu.version_r
     Type:         SHT_GNU_verneed
     Flags:        [ SHF_ALLOC ]
     Link:         .dynstr
     AddressAlign: 0x0000000000000004
     Info:         0x0000000000000002
     Dependencies:
       - Version: 1
         File:    verneed1.so.0
         Entries:
           - Name:  v1
+            Hash:  0
+            Flags: 1
+            Other: 0
+          - Name:  v1
+            Hash:  0
+            Flags: 2
+            Other: 0
+          - Name:  v1
+            Hash:  0
+            Flags: 4
+            Other: 0
+          - Name:  v1
             Hash:  1938
-            Flags: 0
+            Flags: 7
             Other: 4
           - Name:  v2
             Hash:  1939
-            Flags: 0
+            Flags: 8
             Other: 5
       - Version: 1
         File:    verneed2.so.0
         Entries:
           - Name:  v3
             Hash:  1937
             Flags: 0
             Other: 6

 # LLVM-NEXT:   Symbol {
 # LLVM-NEXT:     Version: 6
 # LLVM-NEXT:     Name: sym5@v3
 # LLVM-NEXT:   }
 # LLVM-NEXT: ]
 # LLVM-NEXT: VersionDefinitions [
 # LLVM-NEXT:   Definition {
 # LLVM-NEXT:     Version: 1
-# LLVM-NEXT:     Flags: 0x0
-# LLVM-NEXT:     Index: 2
-# LLVM-NEXT:     Hash: 175630257
+# LLVM-NEXT:     Flags [ (0x0)
+# LLVM-NEXT:     ]
+# LLVM-NEXT:     Index: 0
+# LLVM-NEXT:     Hash: 0
 # LLVM-NEXT:     Name: VERSION1
 # LLVM-NEXT:   }
 # LLVM-NEXT:   Definition {
 # LLVM-NEXT:     Version: 1
-# LLVM-NEXT:     Flags: 0x0
-# LLVM-NEXT:     Index: 3
-# LLVM-NEXT:     Hash: 175630258
-# LLVM-NEXT:     Name: VERSION2
-# LLVM-NEXT:     Predecessor: VERSION1
+# LLVM-NEXT:     Flags [ (0x1)
+# LLVM-NEXT:       Base (0x1)
+# LLVM-NEXT:     ]
+# LLVM-NEXT:     Index: 0
+# LLVM-NEXT:     Hash: 0
+# LLVM-NEXT:     Name: VERSION1
+# LLVM-NEXT:   }
+# LLVM-NEXT:   Definition {
+# LLVM-NEXT:     Version: 1
+# LLVM-NEXT:     Flags [ (0x2)
+# LLVM-NEXT:       Weak (0x2)
+# LLVM-NEXT:     ]
+# LLVM-NEXT:     Index: 0
+# LLVM-NEXT:     Hash: 0
+# LLVM-NEXT:     Name: VERSION1
+# LLVM-NEXT:   }
+# LLVM-NEXT:   Definition {
+# LLVM-NEXT:     Version: 1
+# LLVM-NEXT:     Flags [ (0x4)
+# LLVM-NEXT:       Info (0x4)
+# LLVM-NEXT:     ]
+# LLVM-NEXT:     Index: 0
+# LLVM-NEXT:     Hash: 0
+# LLVM-NEXT:     Name: VERSION1
 # LLVM-NEXT:   }
 # LLVM-NEXT:   Definition {
 # LLVM-NEXT:     Version: 1
-# LLVM-NEXT:     Flags: 0x0
+# LLVM-NEXT:     Flags [ (0x7)
+# LLVM-NEXT:       Base (0x1)
+# LLVM-NEXT:       Info (0x4)
+# LLVM-NEXT:       Weak (0x2)
+# LLVM-NEXT:     ]
+# LLVM-NEXT:     Index: 2
+# LLVM-NEXT:     Hash: 175630257
+# LLVM-NEXT:     Name: VERSION1
+# LLVM-NEXT:   }
+# LLVM-NEXT:   Definition {
+# LLVM-NEXT:     Version: 1
+# LLVM-NEXT:     Flags [ (0x8)
+# LLVM-NEXT:     ]
 # LLVM-NEXT:     Index: 3
 # LLVM-NEXT:     Hash: 175630258
 # LLVM-NEXT:     Name: VERSION2
 # LLVM-NEXT:     Predecessor: VERSION1
 # LLVM-NEXT:   }
 # LLVM-NEXT: ]
 # LLVM-NEXT: VersionRequirements [
 # LLVM-NEXT:   Dependency {
 # LLVM-NEXT:     Version: 1
-# LLVM-NEXT:     Count: 2
+# LLVM-NEXT:     Count: 5
 # LLVM-NEXT:     FileName: verneed1.so.0
 # LLVM-NEXT:     Entries [
 # LLVM-NEXT:       Entry {
+# LLVM-NEXT:         Hash: 0
+# LLVM-NEXT:         Flags [ (0x1)
+# LLVM-NEXT:           Base (0x1)
+# LLVM-NEXT:         ]
+# LLVM-NEXT:         Index: 0
+# LLVM-NEXT:         Name: v1
+# LLVM-NEXT:       }
+# LLVM-NEXT:       Entry {
+# LLVM-NEXT:         Hash: 0
+# LLVM-NEXT:         Flags [ (0x2)
+# LLVM-NEXT:           Weak (0x2)
+# LLVM-NEXT:         ]
+# LLVM-NEXT:         Index: 0
+# LLVM-NEXT:         Name: v1
+# LLVM-NEXT:       }
+# LLVM-NEXT:       Entry {
+# LLVM-NEXT:         Hash: 0
+# LLVM-NEXT:         Flags [ (0x4)
+# LLVM-NEXT:           Info (0x4)
+# LLVM-NEXT:         ]
+# LLVM-NEXT:         Index: 0
+# LLVM-NEXT:         Name: v1
+# LLVM-NEXT:       }
+# LLVM-NEXT:       Entry {
 # LLVM-NEXT:         Hash: 1938
-# LLVM-NEXT:         Flags: 0x0
+# LLVM-NEXT:         Flags [ (0x7)
+# LLVM-NEXT:           Base (0x1)
+# LLVM-NEXT:           Info (0x4)
+# LLVM-NEXT:           Weak (0x2)
+# LLVM-NEXT:         ]
 # LLVM-NEXT:         Index: 4
 # LLVM-NEXT:         Name: v1
 # LLVM-NEXT:       }
 # LLVM-NEXT:       Entry {
 # LLVM-NEXT:         Hash: 1939
-# LLVM-NEXT:         Flags: 0x0
+# LLVM-NEXT:         Flags [ (0x8)
+# LLVM-NEXT:         ]
 # LLVM-NEXT:         Index: 5
 # LLVM-NEXT:         Name: v2
 # LLVM-NEXT:       }
 # LLVM-NEXT:     ]
 # LLVM-NEXT:   }
 # LLVM-NEXT:   Dependency {
 # LLVM-NEXT:     Version: 1
 # LLVM-NEXT:     Count: 1
 # LLVM-NEXT:     FileName: verneed2.so.0
 # LLVM-NEXT:     Entries [
 # LLVM-NEXT:       Entry {
 # LLVM-NEXT:         Hash: 1937
-# LLVM-NEXT:         Flags: 0x0
+# LLVM-NEXT:         Flags [ (0x0)
+# LLVM-NEXT:         ]
 # LLVM-NEXT:         Index: 6
 # LLVM-NEXT:         Name: v3
 # LLVM-NEXT:       }
 # LLVM-NEXT:     ]
 # LLVM-NEXT:   }
 # LLVM-NEXT: ]
 
 # GNU:      Version symbols section '.gnu.version' contains 6 entries:
 # GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 6 (.dynsym)
 # GNU-NEXT:   000:   0 (*local*) 2 (VERSION1) 3 (VERSION2) 4 (v1)
 # GNU-NEXT:   004:   5 (v2)      6 (v3)
 # GNU-EMPTY:
-# GNU-NEXT: Version definition section '.gnu.version_d' contains 3 entries:
-# GNU-NEXT:  Addr: 0000000000000000  Offset: 0x00004c  Link: 7 (.dynstr)
-# GNU-NEXT:   0x0000: Rev: 1  Flags: none  Index: 2  Cnt: 1  Name: VERSION1
-# GNU-NEXT:   0x001c: Rev: 1  Flags: none  Index: 3  Cnt: 2  Name: VERSION2
-# GNU-NEXT:   0x0038: Parent 1: VERSION1
-# GNU-NEXT:   0x001c: Rev: 1  Flags: none  Index: 3  Cnt: 2  Name: VERSION2
-# GNU-NEXT:   0x0038: Parent 1: VERSION1
+# GNU-NEXT:  Version definition section '.gnu.version_d' contains 6 entries:
+# GNU-NEXT:   Addr: 0000000000000000  Offset: 0x00004c  Link: 7 (.dynstr)
+# GNU-NEXT:    0x0000: Rev: 1  Flags: none  Index: 0  Cnt: 1  Name: VERSION1
+# GNU-NEXT:    0x001c: Rev: 1  Flags: BASE  Index: 0  Cnt: 1  Name: VERSION1
+# GNU-NEXT:    0x0038: Rev: 1  Flags: WEAK  Index: 0  Cnt: 1  Name: VERSION1
+# GNU-NEXT:    0x0054: Rev: 1  Flags: INFO  Index: 0  Cnt: 1  Name: VERSION1
+# GNU-NEXT:    0x0070: Rev: 1  Flags: BASE | WEAK | INFO  Index: 2  Cnt: 1  Name: VERSION1
+# GNU-NEXT:    0x008c: Rev: 1  Flags: <unknown>  Index: 3  Cnt: 2  Name: VERSION2
+# GNU-NEXT:    0x00a8: Parent 1: VERSION1
 # GNU-EMPTY:
-# GNU-NEXT: Version needs section '.gnu.version_r' contains 2 entries:
-# GNU-NEXT:  Addr: 0000000000000000  Offset: 0x00008c  Link: 7 (.dynstr)
-# GNU-NEXT:   0x0000: Version: 1  File: verneed1.so.0  Cnt: 2
-# GNU-NEXT:   0x0010:   Name: v1  Flags: none  Version: 4
-# GNU-NEXT:   0x0020:   Name: v2  Flags: none  Version: 5
-# GNU-NEXT:   0x0030: Version: 1  File: verneed2.so.0  Cnt: 1
-# GNU-NEXT:   0x0040:   Name: v3  Flags: none  Version: 6
+# GNU-NEXT:  Version needs section '.gnu.version_r' contains 2 entries:
+# GNU-NEXT:   Addr: 0000000000000000  Offset: 0x0000fc  Link: 7 (.dynstr)
+# GNU-NEXT:    0x0000: Version: 1  File: verneed1.so.0  Cnt: 5
+# GNU-NEXT:    0x0010:   Name: v1  Flags: BASE  Version: 0
+# GNU-NEXT:    0x0020:   Name: v1  Flags: WEAK  Version: 0
+# GNU-NEXT:    0x0030:   Name: v1  Flags: INFO  Version: 0
+# GNU-NEXT:    0x0040:   Name: v1  Flags: BASE | WEAK | INFO  Version: 4
+# GNU-NEXT:    0x0050:   Name: v2  Flags: <unknown>  Version: 5
+# GNU-NEXT:    0x0060: Version: 1  File: verneed2.so.0  Cnt: 1
+# GNU-NEXT:    0x0070:   Name: v3  Flags: none  Version: 6

llvm/test/tools/yaml2obj/ELF/verdef-section.yaml

 ## Check we are able to handle SHT_GNU_verdef sections.
 
 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj -V %t | FileCheck %s
 
 # CHECK:      VersionDefinitions [
 # CHECK-NEXT:   Definition {
 # CHECK-NEXT:     Version: 1
-# CHECK-NEXT:     Flags: Base
+# CHECK-NEXT:     Flags [ (0x1)
+# CHECK-NEXT:       Base (0x1)
+# CHECK-NEXT:     ]
 # CHECK-NEXT:     Index: 1
 # CHECK-NEXT:     Hash: 170240160
 # CHECK-NEXT:     Name: dso.so.0
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Definition {
 # CHECK-NEXT:     Version: 1
-# CHECK-NEXT:     Flags: Weak
+# CHECK-NEXT:     Flags [ (0x2)
+# CHECK-NEXT:       Weak (0x2)
+# CHECK-NEXT:     ]
 # CHECK-NEXT:     Index: 2
 # CHECK-NEXT:     Hash: 108387921
 # CHECK-NEXT:     Name: VERSION_1
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Definition {
 # CHECK-NEXT:     Version: 1
-# CHECK-NEXT:     Flags: 0x3
+# CHECK-NEXT:     Flags [ (0x3)
+# CHECK-NEXT:       Base (0x1)
+# CHECK-NEXT:       Weak (0x2)
+# CHECK-NEXT:     ]
 # CHECK-NEXT:     Index: 3
 # CHECK-NEXT:     Hash: 108387922
 # CHECK-NEXT:     Name: VERSION_2
 # CHECK-NEXT:     Predecessor: VERSION_3
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
 --- !ELF

llvm/test/tools/yaml2obj/ELF/verneed-section.yaml

 ## Check we are able to handle SHT_GNU_verneed sections.
 
 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj -V %t | FileCheck %s
 
 # CHECK:      VersionRequirements [
 # CHECK-NEXT:   Dependency {
 # CHECK-NEXT:     Version: 1
 # CHECK-NEXT:     Count: 2
 # CHECK-NEXT:     FileName: dso.so.0
 # CHECK-NEXT:     Entries [
 # CHECK-NEXT:       Entry {
 # CHECK-NEXT:         Hash: 1937
-# CHECK-NEXT:         Flags: 0xA
+# CHECK-NEXT:         Flags [ (0xA)
+# CHECK-NEXT:           Weak (0x2)
+# CHECK-NEXT:         ]
 # CHECK-NEXT:         Index: 3
 # CHECK-NEXT:         Name: v1
 # CHECK-NEXT:       }
 # CHECK-NEXT:       Entry {
 # CHECK-NEXT:         Hash: 1938
-# CHECK-NEXT:         Flags: 0xB
+# CHECK-NEXT:         Flags [ (0xB)
+# CHECK-NEXT:           Base (0x1)
+# CHECK-NEXT:           Weak (0x2)
+# CHECK-NEXT:         ]
 # CHECK-NEXT:         Index: 4
 # CHECK-NEXT:         Name: v2
 # CHECK-NEXT:       }
 # CHECK-NEXT:     ]
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Dependency {
 # CHECK-NEXT:     Version: 1
 # CHECK-NEXT:     Count: 1
 # CHECK-NEXT:     FileName: dso.so.1
 # CHECK-NEXT:     Entries [
 # CHECK-NEXT:       Entry {
 # CHECK-NEXT:         Hash: 1939
-# CHECK-NEXT:         Flags: 0xC
+# CHECK-NEXT:         Flags [ (0xC)
+# CHECK-NEXT:           Info (0x4)
+# CHECK-NEXT:         ]
 # CHECK-NEXT:         Index: 2
 # CHECK-NEXT:         Name: v3
 # CHECK-NEXT:       }
 # CHECK-NEXT:     ]
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
 --- !ELF

llvm/test/tools/yaml2obj/ELF/versym-section.yaml

 # CHECK-NEXT: VersionRequirements [
 # CHECK-NEXT:   Dependency {
 # CHECK-NEXT:     Version: 1
 # CHECK-NEXT:     Count: 2
 # CHECK-NEXT:     FileName: dso.so.0
 # CHECK-NEXT:     Entries [
 # CHECK-NEXT:       Entry {
 # CHECK-NEXT:         Hash: 1937
-# CHECK-NEXT:         Flags: 0x0
+# CHECK-NEXT:         Flags [ (0x0)
+# CHECK-NEXT:         ]
 # CHECK-NEXT:         Index: 3
 # CHECK-NEXT:         Name: v1
 # CHECK-NEXT:       }
 # CHECK-NEXT:       Entry {
 # CHECK-NEXT:         Hash: 1938
-# CHECK-NEXT:         Flags: 0x0
+# CHECK-NEXT:         Flags [ (0x0)
+# CHECK-NEXT:         ]
 # CHECK-NEXT:         Index: 4
 # CHECK-NEXT:         Name: v2
 # CHECK-NEXT:       }
 # CHECK-NEXT:     ]
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
 --- !ELF

llvm/tools/llvm-readobj/ELFDumper.cpp

while (VerDefsNum--) {
     if (VerdefBuf + sizeof(Elf_Verdef) > SecEndAddress)
       // FIXME: report_fatal_error is not a good way to report error. We should
       // emit a parsing error here and below.
       report_fatal_error("invalid offset in the section");
 
     const Elf_Verdef *Verdef = reinterpret_cast<const Elf_Verdef *>(VerdefBuf);
     DictScope Def(W, "Definition");
     W.printNumber("Version", Verdef->vd_version);
-    W.printEnum("Flags", Verdef->vd_flags, makeArrayRef(SymVersionFlags));
+    W.printFlags("Flags", Verdef->vd_flags, makeArrayRef(SymVersionFlags));
     W.printNumber("Index", Verdef->vd_ndx);
     W.printNumber("Hash", Verdef->vd_hash);
     W.printString("Name", StringRef(reinterpret_cast<const char *>(
                               Obj->base() + StrTab->sh_offset +
                               Verdef->getAux()->vda_name)));
     if (!Verdef->vd_cnt)
       report_fatal_error("at least one definition string must exist");
     if (Verdef->vd_cnt > 2)
for (unsigned I = 0; I < VerneedNum; ++I) {
 
     const uint8_t *VernauxBuf = VerneedBuf + Verneed->vn_aux;
     ListScope L(W, "Entries");
     for (unsigned J = 0; J < Verneed->vn_cnt; ++J) {
       const Elf_Vernaux *Vernaux =
           reinterpret_cast<const Elf_Vernaux *>(VernauxBuf);
       DictScope Entry(W, "Entry");
       W.printNumber("Hash", Vernaux->vna_hash);
-      W.printEnum("Flags", Vernaux->vna_flags, makeArrayRef(SymVersionFlags));
+      W.printFlags("Flags", Vernaux->vna_flags, makeArrayRef(SymVersionFlags));
       W.printNumber("Index", Vernaux->vna_other);
 
       StringRef Name = StringTable.size() > Vernaux->vna_name
                            ? StringTable.drop_front(Vernaux->vna_name)
                            : "<invalid>";
       W.printString("Name", Name.data());
       VernauxBuf += Vernaux->vna_next;
     }