[lld] r351790 - [LLD][ELF]Fix tests for D56910

[James Henderson via llvm-commits]

Author: jhenderson
Date: Tue Jan 22 01:35:47 2019
New Revision: 351790

URL: http://llvm.org/viewvc/llvm-project?rev=351790&view=rev
Log:
[LLD][ELF]Fix tests for D56910

r351789 changes the output of llvm-readelf --dyn-symbols. This causes 3
LLD tests to break. This patch fixes them.

Reviewed by: ruiu

Differential Revision: https://reviews.llvm.org/D56911

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

Modified: lld/trunk/test/ELF/as-needed-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/as-needed-weak.s?rev=351790&r1=351789&r2=351790&view=diff
==============================================================================
--- lld/trunk/test/ELF/as-needed-weak.s (original)
+++ lld/trunk/test/ELF/as-needed-weak.s Tue Jan 22 01:35:47 2019
@@ -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

Modified: lld/trunk/test/ELF/icf-symbol-type.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/icf-symbol-type.s?rev=351790&r1=351789&r2=351790&view=diff
==============================================================================
--- lld/trunk/test/ELF/icf-symbol-type.s (original)
+++ lld/trunk/test/ELF/icf-symbol-type.s Tue Jan 22 01:35:47 2019
@@ -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.

Modified: lld/trunk/test/ELF/linkerscript/provide-shared2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/provide-shared2.s?rev=351790&r1=351789&r2=351790&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/provide-shared2.s (original)
+++ lld/trunk/test/ELF/linkerscript/provide-shared2.s Tue Jan 22 01:35:47 2019
@@ -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: