[lld] r265588 - Make this test a bit stronger.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Wed Apr  6 14:38:26 2016
New Revision: 265588

URL: http://llvm.org/viewvc/llvm-project?rev=265588&view=rev
Log:
Make this test a bit stronger.

Show that in addition to handling empty .eh_frame, it is merged with any
regular .eh_frame.

Added:
    lld/trunk/test/ELF/Inputs/ehframe-relocation.s
Modified:
    lld/trunk/test/ELF/ehframe-relocation.s

Added: lld/trunk/test/ELF/Inputs/ehframe-relocation.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/ehframe-relocation.s?rev=265588&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/ehframe-relocation.s (added)
+++ lld/trunk/test/ELF/Inputs/ehframe-relocation.s Wed Apr  6 14:38:26 2016
@@ -0,0 +1,2 @@
+        .cfi_startproc
+        .cfi_endproc

Modified: lld/trunk/test/ELF/ehframe-relocation.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ehframe-relocation.s?rev=265588&r1=265587&r2=265588&view=diff
==============================================================================
--- lld/trunk/test/ELF/ehframe-relocation.s (original)
+++ lld/trunk/test/ELF/ehframe-relocation.s Wed Apr  6 14:38:26 2016
@@ -1,6 +1,7 @@
 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
-// RUN: ld.lld %t.o -o %t
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/ehframe-relocation.s  -o %t2.o
+// RUN: ld.lld %t.o %t2.o -o %t
 // RUN: llvm-readobj -s %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
@@ -11,7 +12,8 @@
 // CHECK-NEXT: ]
 // CHECK-NEXT: Address: 0x10120
 // CHECK-NEXT: Offset:
-// CHECK-NEXT: Size: 0
+// CHECK-NEXT: Size: 48
+// CHECK-NOT: .eh_frame
 
 // 0x10120 = 65824
 // 0x10120 + 5 = 65829