Index: llvm/trunk/test/tools/llvm-readobj/demangle.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/demangle.test
+++ llvm/trunk/test/tools/llvm-readobj/demangle.test
@@ -117,18 +117,11 @@
   Type:            ET_DYN
   Machine:         EM_X86_64
 Sections:
-  ## TODO:  Replace the raw section contents with more meaningful dynamic
-  ## tags/symbols/etc, once yaml2obj supports it.
-  ## FIXME: yaml2obj does not currently allow custom addresses for .dynstr and
-  ## .dynsym if DynamicSymbols are specified.
-  ## See https://bugs.llvm.org/show_bug.cgi?id=40339
   - Name:         .dynstr
     Type:         SHT_STRTAB
     Flags:        [ SHF_ALLOC ]
     AddressAlign: 0x100
     EntSize:      0x1
-    ## "\0_Z3fooi\0"
-    Content: "005f5a33666f6f6900"
   - Name:         .dynsym
     Type:         SHT_DYNSYM
     Flags:        [ SHF_ALLOC ]
@@ -136,10 +129,6 @@
     Address:      0x100
     AddressAlign: 0x100
     EntSize:      0x18
-    ## Null symbol;
-    ## st_name: 1; st_info: Global | Func; st_other: 0;
-    ##   st_shndx: .text.foo; st_value: 0x2000; st_size: 0
-    Content: "000000000000000000000000000000000000000000000000010000001200050000200000000000000000000000000000"
   - Name:         .rela.dyn
     Type:         SHT_RELA
     Flags:        [ SHF_ALLOC ]
@@ -218,6 +207,9 @@
     Type:    STT_FUNC
     Section: .text.foo
     Binding: STB_GLOBAL
+DynamicSymbols:
+  - Name:    _Z3fooi
+    Binding: STB_GLOBAL
 ProgramHeaders:
   - Type:  PT_LOAD
     Flags: [ PF_R, PF_X ]
Index: llvm/trunk/test/tools/llvm-readobj/gnu-hash-symbols.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/gnu-hash-symbols.test
+++ llvm/trunk/test/tools/llvm-readobj/gnu-hash-symbols.test
@@ -47,18 +47,11 @@
   Type:            ET_DYN
   Machine:         EM_X86_64
 Sections:
-  ## TODO:  Replace the raw section contents with more meaningful dynamic
-  ## tags/symbols/etc, once yaml2obj supports it.
-  ## FIXME: yaml2obj does not currently allow custom addresses for .dynstr and
-  ## .dynsym if DynamicSymbols are specified.
-  ## See https://bugs.llvm.org/show_bug.cgi?id=40339
   - Name:         .dynstr
     Type:         SHT_STRTAB
     Flags:        [ SHF_ALLOC ]
     AddressAlign: 0x100
     EntSize:      0x1
-    ## "\0_Z3fooi\0"
-    Content: "005f5a33666f6f6900"
   - Name:         .dynsym
     Type:         SHT_DYNSYM
     Flags:        [ SHF_ALLOC ]
@@ -66,10 +59,6 @@
     Address:      0x100
     AddressAlign: 0x100
     EntSize:      0x18
-    ## Null symbol;
-    ## st_name: 1; st_info: Global | Func; st_other: 0;
-    ##   st_shndx: .text.foo; st_value: 0x2000; st_size: 0
-    Content: "000000000000000000000000000000000000000000000000010000001200040000200000000000000000000000000000"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
@@ -94,6 +83,9 @@
     Size:  0x40
     Address: 0x2000
     AddressAlign: 0x2000
+DynamicSymbols:
+  - Name:    _Z3fooi
+    Binding: STB_GLOBAL
 ProgramHeaders:
   - Type:  PT_LOAD
     Flags: [ PF_R, PF_X ]