[llvm-branch-commits] [lld] r345732 - Merging r343669:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Wed Oct 31 08:58:47 2018
New Revision: 345732

URL: http://llvm.org/viewvc/llvm-project?rev=345732&view=rev
Log:
Merging r343669:

------------------------------------------------------------------------
r343669 | grimar | 2018-10-03 02:59:08 -0700 (Wed, 03 Oct 2018) | 6 lines

[ELF] - Fix BB after r343668

This stops testing the value of .rela.plt section offset.

Also makes _start global to eliminate
'cannot find entry symbol _start' warning.
------------------------------------------------------------------------

Modified:
    lld/branches/release_70/test/ELF/local-ver-preemptible.s

Modified: lld/branches/release_70/test/ELF/local-ver-preemptible.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_70/test/ELF/local-ver-preemptible.s?rev=345732&r1=345731&r2=345732&view=diff
==============================================================================
--- lld/branches/release_70/test/ELF/local-ver-preemptible.s (original)
+++ lld/branches/release_70/test/ELF/local-ver-preemptible.s Wed Oct 31 08:58:47 2018
@@ -9,7 +9,7 @@
 # RUN: ld.lld %t.o %t.so -o %t -version-script %t.script
 # RUN: llvm-readelf -r --symbols %t | FileCheck %s
 
-# CHECK:      Relocation section '.rela.plt' at offset 0x290 contains 1 entries:
+# CHECK:      Relocation section '.rela.plt' at offset {{.*}} contains 1 entries:
 # CHECK:        R_X86_64_JUMP_SLOT 0000000000201020 foo + 0
 
 # CHECK:      Symbol table '.dynsym' contains 2 entries:
@@ -17,5 +17,6 @@
 # CHECK-NEXT:     0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND @
 # CHECK-NEXT:     1: 0000000000201020     0 FUNC    GLOBAL DEFAULT  UND foo@
 
+.globl _start
 _start:
   movl $foo - ., %eax