2001-05-18 H.J. Lu <hjl@gnu.org>

* ld-elfvers/vers.exp: Revert the last change.

	* ld-elfvers/vers2.ver: Put back "tmpdir/" the version
	references.
	* ld-elfvers/vers3.ver: Likewise.
	* ld-elfvers/vers6.ver: Likewise.
	* ld-elfvers/vers18.ver: Likewise.

ld/testsuite/ChangeLog

@@ -1,3 +1,13 @@
+2001-05-18  H.J. Lu  <hjl@gnu.org>
+
+	* ld-elfvers/vers.exp: Revert the last change.
+
+	* ld-elfvers/vers2.ver: Put back "tmpdir/" the version
+	references.
+	* ld-elfvers/vers3.ver: Likewise.
+	* ld-elfvers/vers6.ver: Likewise.
+	* ld-elfvers/vers18.ver: Likewise.
+
 2001-05-17  H.J. Lu  <hjl@gnu.org>
 
 	* ld-elfvers/vers.exp: Pass "-rpath .:$tmpdir" to "vers19".

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 .:$tmpdir" vers18.so vers19.ver vers19.dsym ""
+build_exec "vers19" vers19.c vers19 "-rpath ." vers18.so vers19.ver vers19.dsym ""

ld/testsuite/ld-elfvers/vers18.ver

@@ -7,6 +7,6 @@ Version definitions:
 	VERS_1.2 
 
 Version References:
-  required from vers17.so:
+  required from tmpdir/vers17.so:
     0x0a7922b0 0x00 05 VERS_2.0
 

ld/testsuite/ld-elfvers/vers2.ver

@@ -3,6 +3,6 @@ Version definitions:
 2 0x00 0x08785b51 VERS_XXX_1.1
 
 Version References:
-  required from vers1.so:
+  required from tmpdir/vers1.so:
     0x0a7922b0 0x00 03 VERS_2.0
 

ld/testsuite/ld-elfvers/vers3.ver

@@ -1,4 +1,4 @@
 Version References:
-  required from vers1.so:
+  required from tmpdir/vers1.so:
     0x0a7922b0 0x00 02 VERS_2.0
 

ld/testsuite/ld-elfvers/vers6.ver

@@ -1,5 +1,5 @@
 Version References:
-  required from vers1.so:
+  required from tmpdir/vers1.so:
     0x0a7927b1 0x00 ?? VERS_1.1
     0x0a7927b2 0x00 ?? VERS_1.2
     0x0a7922b0 0x00 ?? VERS_2.0