[PATCH] D56911: [LLD][ELF]Fix tests for D56910

[James Henderson via Phabricator via llvm-commits]

jhenderson created this revision.
jhenderson added reviewers: ruiu, grimar, rupprecht, jakehehrlich.
Herald added subscribers: arichardson, emaste.
Herald added a reviewer: espindola.

D56910 <https://reviews.llvm.org/D56910> changes the output of llvm-readelf --dyn-symbols. This causes 3 LLD tests to break. This patch fixes them.


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D56911

Files:
  test/ELF/as-needed-weak.s
  test/ELF/icf-symbol-type.s
  test/ELF/linkerscript/provide-shared2.s


Index: test/ELF/linkerscript/provide-shared2.s
===================================================================
--- test/ELF/linkerscript/provide-shared2.s
+++ test/ELF/linkerscript/provide-shared2.s
@@ -6,7 +6,7 @@
 # RUN: ld.lld -o %t --script %t.script %t.o %t2.so
 # RUN: llvm-readelf --dyn-symbols %t | FileCheck  %s
 
-# CHECK: 1 1: 000000000000002a 0 NOTYPE GLOBAL DEFAULT ABS foo
+# CHECK: 1: 000000000000002a 0 NOTYPE GLOBAL DEFAULT ABS foo
 
 .global _start
 _start:
Index: test/ELF/icf-symbol-type.s
===================================================================
--- test/ELF/icf-symbol-type.s
+++ test/ELF/icf-symbol-type.s
@@ -7,8 +7,8 @@
 # We used to mark bar as absolute.
 
 # CHECK: .text             PROGBITS        0000000000001000
-# CHECK: 0000000000001001 0 NOTYPE  GLOBAL DEFAULT   4 foo
 # CHECK: 0000000000001001 0 NOTYPE  GLOBAL DEFAULT   4 bar
+# CHECK: 0000000000001001 0 NOTYPE  GLOBAL DEFAULT   4 foo
 
 # The nop makes the test more interesting by making the offset of
 # text.f non zero.
Index: test/ELF/as-needed-weak.s
===================================================================
--- test/ELF/as-needed-weak.s
+++ test/ELF/as-needed-weak.s
@@ -10,9 +10,10 @@
 
 # CHECK-NOT: libfoo
 
-# CHECK:      Symbol table of .hash for image:
-# CHECK-NEXT: Num Buc:    Value          Size   Type   Bind Vis      Ndx Name
-# CHECK-NEXT:   1   1: 0000000000000000     0 FUNC    WEAK   DEFAULT UND foo
+# CHECK:      Symbol table '.dynsym' contains 2 entries:
+# CHECK-NEXT: Num:    Value          Size Type    Bind   Vis     Ndx Name
+# CHECK-NEXT:   0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT UND
+# CHECK-NEXT:   1: 0000000000000000     0 FUNC    WEAK   DEFAULT UND foo
 
 .globl _start
 .weak foo


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D56911.182518.patch
Type: text/x-patch
Size: 1743 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190118/b233a3bf/attachment.bin>