summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2017-04-24 23:51:18 +0000
committerRui Ueyama <ruiu@google.com>2017-04-24 23:51:18 +0000
commitc1d043c40a010a5677d731f1f3cdaedb07f8529f (patch)
treed8c33b0a06cd207c893f63eb7a0bacb2e450c81b
parent273bbbc3a7e84a10d71596a4cbd020aeaee28d1f (diff)
downloadbcm5719-llvm-c1d043c40a010a5677d731f1f3cdaedb07f8529f.tar.gz
bcm5719-llvm-c1d043c40a010a5677d731f1f3cdaedb07f8529f.zip
Replace a binary .so with a text .s.
Since LLD is now able to take version scripts, we no longer have to keep a pre-generated binary file for a test. llvm-svn: 301279
-rw-r--r--lld/test/ELF/Inputs/progname-ver.s3
-rwxr-xr-xlld/test/ELF/Inputs/progname-ver.sobin1680 -> 0 bytes
-rw-r--r--lld/test/ELF/progname.s28
3 files changed, 11 insertions, 20 deletions
diff --git a/lld/test/ELF/Inputs/progname-ver.s b/lld/test/ELF/Inputs/progname-ver.s
new file mode 100644
index 00000000000..06fc294a098
--- /dev/null
+++ b/lld/test/ELF/Inputs/progname-ver.s
@@ -0,0 +1,3 @@
+.global bar
+bar:
+.quad __progname@GOT
diff --git a/lld/test/ELF/Inputs/progname-ver.so b/lld/test/ELF/Inputs/progname-ver.so
deleted file mode 100755
index e6bb3228f6c..00000000000
--- a/lld/test/ELF/Inputs/progname-ver.so
+++ /dev/null
Binary files differ
diff --git a/lld/test/ELF/progname.s b/lld/test/ELF/progname.s
index 10cbf177c69..a8837da69b5 100644
--- a/lld/test/ELF/progname.s
+++ b/lld/test/ELF/progname.s
@@ -1,31 +1,19 @@
-// RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %t.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
// RUN: echo .global __progname > %t2.s
-// RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %t2.s -o %t2.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %t2.s -o %t2.o
// RUN: ld.lld -shared %t2.o -o %t2.so
// RUN: ld.lld -o %t %t.o %t2.so
// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
-
-// Inputs/progname-ver.so consists of the assembly file
-//
-// .global bar
-// bar:
-// .quad __progname
-//
-// linked into a library with the version script
-//
-// VER_1 {
-// global:
-// bar;
-// };
-//
-// We should create it with lld itself once we it supports that.
-
-// RUN: ld.lld -o %t %t.o %p/Inputs/progname-ver.so
+// RUN: echo "VER_1 { global: bar; };" > %s.script
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux \
+// RUN: %p/Inputs/progname-ver.s -o %t-ver.o
+// RUN: ld.lld -shared -o %t.so -version-script %s.script %t-ver.o
+// RUN: ld.lld -o %t %t.o %t.so
// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
// CHECK: Name: __progname@
-// CHECK-NEXT: Value: 0x11000
+// CHECK-NEXT: Value: 0x201000
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Global (0x1)
// CHECK-NEXT: Type: None (0x0)
OpenPOWER on IntegriCloud