14 files changed, 33 insertions, 15 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 68862d7..6f7eecc 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2001-05-17  H.J. Lu  <hjl@gnu.org>
+
+	* ld-elfvers/vers.exp: Pass "-rpath .:$tmpdir" to "vers19".
+
+	* ld-elfvers/vers1.ver: Remove "tmpdir/" from the version
+	definition.
+	* ld-elfvers/vers2.ver: Likewise.
+	* ld-elfvers/vers3.ver: Likewise.
+	* ld-elfvers/vers4a.ver: Likewise.
+	* ld-elfvers/vers6.ver: Likewise.
+	* ld-elfvers/vers7a.ver: Likewise.
+	* ld-elfvers/vers8.ver: Likewise.
+	* ld-elfvers/vers9.ver: Likewise.
+	* ld-elfvers/vers15.ver: Likewise.
+	* ld-elfvers/vers16a.ver: Likewise.
+	* ld-elfvers/vers17.ver: Likewise.
+	* ld-elfvers/vers18.ver: Likewise.
+
 2001-05-03  H.J. Lu  <hjl@gnu.org>
 
 	* ld-elfvers/vers19.ver: Expect vers17.so instead of
diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index a986dda..e300e03 100644
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -814,4 +814,4 @@ build_exec "vers16" vers16.c vers16 "" vers16a.so "" vers16.dsym ""
 # Test a weak versioned symbol.
 build_vers_lib "vers17" vers17.c vers17 "" vers17.map vers17.ver vers17.dsym ""
 build_vers_lib "vers18" vers18.c vers18 vers17.so vers18.map vers18.ver vers18.dsym vers18.sym
-build_exec "vers19" vers19.c vers19 "-rpath ." vers18.so vers19.ver vers19.dsym ""
+build_exec "vers19" vers19.c vers19 "-rpath .:$tmpdir" vers18.so vers19.ver vers19.dsym ""
diff --git a/ld/testsuite/ld-elfvers/vers1.ver b/ld/testsuite/ld-elfvers/vers1.ver
index 3e7312b..ace685d 100644
--- a/ld/testsuite/ld-elfvers/vers1.ver
+++ b/ld/testsuite/ld-elfvers/vers1.ver
@@ -1,5 +1,5 @@
 Version definitions:
-1 0x01 0x0a26881f tmpdir/vers1.so
+1 0x01 0x0c96425f vers1.so
 2 0x00 0x0a7927b1 VERS_1.1
 3 0x00 0x0a7927b2 VERS_1.2
 	VERS_1.1 
diff --git a/ld/testsuite/ld-elfvers/vers15.ver b/ld/testsuite/ld-elfvers/vers15.ver
index 3d2ec58..f60021e 100644
--- a/ld/testsuite/ld-elfvers/vers15.ver
+++ b/ld/testsuite/ld-elfvers/vers15.ver
@@ -1,5 +1,5 @@
 Version definitions:
-1 0x01 0x0d8a2605 tmpdir/vers15
+1 0x01 0x07cc9645 vers15
 2 0x00 0x0a7927b2 VERS_1.2
 3 0x00 0x0a7927b1 VERS_1.1
 
diff --git a/ld/testsuite/ld-elfvers/vers16a.ver b/ld/testsuite/ld-elfvers/vers16a.ver
index bccf1df..5b6063b 100644
--- a/ld/testsuite/ld-elfvers/vers16a.ver
+++ b/ld/testsuite/ld-elfvers/vers16a.ver
@@ -1,3 +1,3 @@
 Version definitions:
-1 0x01 0x0601cfbf tmpdir/vers16a.so
+1 0x01 0x064c090f vers16a.so
 2 0x00 0x0a7927b1 VERS_1.1
diff --git a/ld/testsuite/ld-elfvers/vers17.ver b/ld/testsuite/ld-elfvers/vers17.ver
index e78d59c..0dad2a6 100644
--- a/ld/testsuite/ld-elfvers/vers17.ver
+++ b/ld/testsuite/ld-elfvers/vers17.ver
@@ -1,3 +1,3 @@
 Version definitions:
-1 0x01 0x02605d3f tmpdir/vers17.so
+1 0x01 0x0964f95f vers17.so
 2 0x00 0x0a7922b0 VERS_2.0
diff --git a/ld/testsuite/ld-elfvers/vers18.ver b/ld/testsuite/ld-elfvers/vers18.ver
index d252996..3996424 100644
--- a/ld/testsuite/ld-elfvers/vers18.ver
+++ b/ld/testsuite/ld-elfvers/vers18.ver
@@ -1,5 +1,5 @@
 Version definitions:
-1 0x01 0x02608d3f tmpdir/vers18.so
+1 0x01 0x0964e95f vers18.so
 2 0x00 0x0a7927b1 VERS_1.1
 3 0x00 0x0a7927b2 VERS_1.2
 	VERS_1.1 
@@ -7,6 +7,6 @@ Version definitions:
 	VERS_1.2 
 
 Version References:
-  required from tmpdir/vers17.so:
+  required from vers17.so:
     0x0a7922b0 0x00 05 VERS_2.0
 
diff --git a/ld/testsuite/ld-elfvers/vers2.ver b/ld/testsuite/ld-elfvers/vers2.ver
index b526343..2f22273 100644
--- a/ld/testsuite/ld-elfvers/vers2.ver
+++ b/ld/testsuite/ld-elfvers/vers2.ver
@@ -1,8 +1,8 @@
 Version definitions:
-1 0x01 0x0a26181f tmpdir/vers2.so
+1 0x01 0x0c96525f vers2.so
 2 0x00 0x08785b51 VERS_XXX_1.1
 
 Version References:
-  required from tmpdir/vers1.so:
+  required from vers1.so:
     0x0a7922b0 0x00 03 VERS_2.0
 
diff --git a/ld/testsuite/ld-elfvers/vers3.ver b/ld/testsuite/ld-elfvers/vers3.ver
index aa230ee..d60fbc1 100644
--- a/ld/testsuite/ld-elfvers/vers3.ver
+++ b/ld/testsuite/ld-elfvers/vers3.ver
@@ -1,4 +1,4 @@
 Version References:
-  required from tmpdir/vers1.so:
+  required from vers1.so:
     0x0a7922b0 0x00 02 VERS_2.0
 
diff --git a/ld/testsuite/ld-elfvers/vers4a.ver b/ld/testsuite/ld-elfvers/vers4a.ver
index 876cedc..41ee241 100644
--- a/ld/testsuite/ld-elfvers/vers4a.ver
+++ b/ld/testsuite/ld-elfvers/vers4a.ver
@@ -1,4 +1,4 @@
 Version definitions:
-1 0x01 0x0d8a26e1 tmpdir/vers4a
+1 0x01 0x07cc96a1 vers4a
 2 0x00 0x0a7922b0 VERS_2.0
 
diff --git a/ld/testsuite/ld-elfvers/vers6.ver b/ld/testsuite/ld-elfvers/vers6.ver
index 48a2b46..62b7f6d 100644
--- a/ld/testsuite/ld-elfvers/vers6.ver
+++ b/ld/testsuite/ld-elfvers/vers6.ver
@@ -1,5 +1,5 @@
 Version References:
-  required from tmpdir/vers1.so:
+  required from vers1.so:
     0x0a7927b1 0x00 ?? VERS_1.1
     0x0a7927b2 0x00 ?? VERS_1.2
     0x0a7922b0 0x00 ?? VERS_2.0
diff --git a/ld/testsuite/ld-elfvers/vers7a.ver b/ld/testsuite/ld-elfvers/vers7a.ver
index 37ef8a8..7b3bf0a 100644
--- a/ld/testsuite/ld-elfvers/vers7a.ver
+++ b/ld/testsuite/ld-elfvers/vers7a.ver
@@ -1,4 +1,4 @@
 Version definitions:
-1 0x01 0x0269fd3f tmpdir/vers7a.so
+1 0x01 0x096d595f vers7a.so
 2 0x00 0x05aa7921 VERS_1
 
diff --git a/ld/testsuite/ld-elfvers/vers8.ver b/ld/testsuite/ld-elfvers/vers8.ver
index ef59023..a4b5296 100644
--- a/ld/testsuite/ld-elfvers/vers8.ver
+++ b/ld/testsuite/ld-elfvers/vers8.ver
@@ -1,5 +1,5 @@
 Version definitions:
-1 0x01 0x0a26f81f tmpdir/vers8.so
+1 0x01 0x0c96b25f vers8.so
 2 0x00 0x0a7927b1 VERS_1.1
 3 0x00 0x0a7927b2 VERS_1.2
 	VERS_1.1 
diff --git a/ld/testsuite/ld-elfvers/vers9.ver b/ld/testsuite/ld-elfvers/vers9.ver
index 673ba72..cc73691 100644
--- a/ld/testsuite/ld-elfvers/vers9.ver
+++ b/ld/testsuite/ld-elfvers/vers9.ver
@@ -1,5 +1,5 @@
 Version definitions:
-1 0x01 0x04d8a269 tmpdir/vers9
+1 0x01 0x007cc969 vers9
 2 0x00 0x0a7927b1 VERS_1.1
 3 0x00 0x0a7927b2 VERS_1.2