* ld-elfvers/vers.exp: Enable test for powerpc64.

	* ld-elfweak/elfweak.exp: Likewise
	* ld-shared/shared.exp: Likewise.  Xfail non-pic dso tests for ppc64.
	* ld-elfvers/vers1.dsym, * ld-elfvers/vers1.sym,
	* ld-elfvers/vers2.dsym, * ld-elfvers/vers3.dsym,
	* ld-elfvers/vers4.sym, * ld-elfvers/vers4a.dsym,
	* ld-elfvers/vers4a.sym, * ld-elfvers/vers6.dsym,
	* ld-elfvers/vers6.sym, * ld-elfvers/vers7a.dsym,
	* ld-elfvers/vers7a.sym, * ld-elfvers/vers9.dsym,
	* ld-elfvers/vers9.sym, * ld-elfvers/vers15.dsym,
	* ld-elfvers/vers15.sym, * ld-elfvers/vers16.dsym,
	* ld-elfvers/vers16a.dsym, * ld-elfvers/vers17.dsym,
	* ld-elfvers/vers18.dsym, * ld-elfvers/vers18.sym,
	* ld-elfvers/vers19.dsym, * ld-elfvers/vers20.dsym,
	* ld-elfvers/vers21.dsym, * ld-elfvers/vers21.sym,
	* ld-elfvers/vers22.dsym, * ld-elfvers/vers22a.dsym,
	* ld-elfvers/vers22a.sym, * ld-elfvers/vers22b.dsym,
	* ld-elfvers/vers23.dsym, * ld-elfvers/vers23a.dsym,
	* ld-elfvers/vers23a.sym, * ld-elfvers/vers23b.dsym,
	* ld-elfvers/vers25a.dsym, * ld-elfvers/vers26a.dsym,
	* ld-elfvers/vers27a.dsym, * ld-elfvers/vers27d.dsym,
	* ld-elfvers/vers27d.sym, * ld-elfvers/vers27d4.dsym,
	* ld-elfvers/vers28b.dsym, * ld-elfvers/vers28c.dsym,
	* ld-elfvers/vers29.dsym, * ld-elfvers/vers30.dsym,
	* ld-elfvers/vers31.dsym, * ld-elfvers/vers32a.dsym,
	* ld-elfvers/vers32b.dsym, * ld-elfvers/vers32c.dsym,
	* ld-elfweak/dso.dsym, * ld-elfweak/dsodata.dsym,
	* ld-elfweak/dsow.dsym, * ld-elfweak/dsowdata.dsym,
	* ld-elfweak/strong.sym, * ld-elfweak/strongcomm.sym,
	* ld-elfweak/strongdata.sym, * ld-elfweak/weak.dsym,
	* ld-elfweak/weakdata.dsym: Relax whitespace matching, tighten
	non-whitespace matching.  Match powerpc64 functions in .opd section.
	* ld-shared/elf-offset.ld: Place powerpc64 .toc sections.

10 files changed, 15 insertions, 15 deletions

diff --git a/ld/testsuite/ld-elfweak/dso.dsym b/ld/testsuite/ld-elfweak/dso.dsym
index be1b186507..f69c29b6c9 100644
--- a/ld/testsuite/ld-elfweak/dso.dsym
+++ b/ld/testsuite/ld-elfweak/dso.dsym
@@ -1 +1 @@
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+(Base[ 	]+|[ 	]*)(0x[0-9a-f]+|)[ 	]*foo
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+(Base[ 	]+|[ 	]*)(0x[0-9a-f]+ )?foo
diff --git a/ld/testsuite/ld-elfweak/dsodata.dsym b/ld/testsuite/ld-elfweak/dsodata.dsym
index 2b1f9343f0..d4a09cc21d 100644
--- a/ld/testsuite/ld-elfweak/dsodata.dsym
+++ b/ld/testsuite/ld-elfweak/dsodata.dsym
@@ -1,2 +1,2 @@
-[0-9a-f]*[ 	]+g[ 	]+DO[ 	]+.(s|)(data|bss)[	]+[0-9a-f]*[ 	]+(Base[ 	]+|[ 	]*)deallocate_foo
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+(Base[ 	]+|[ 	]*)(0x[0-9a-f]*|)[ 	]*foo
+[0-9a-f]+[ 	]+g[ 	]+DO[ 	]+\.s?(data|bss)[	]+[0-9a-f]+[ 	]+(Base[ 	]+|[ 	]*)deallocate_foo
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+(Base[ 	]+|[ 	]*)(0x[0-9a-f]+ )?foo
diff --git a/ld/testsuite/ld-elfweak/dsow.dsym b/ld/testsuite/ld-elfweak/dsow.dsym
index cc36c6f313..e3aa87ae22 100644
--- a/ld/testsuite/ld-elfweak/dsow.dsym
+++ b/ld/testsuite/ld-elfweak/dsow.dsym
@@ -1 +1 @@
-[0-9a-f]*[ 	]+w[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+(Base[ 	]+|[ 	]*)(0x[0-9a-f]+|)[ 	]*foo
+[0-9a-f]+[ 	]+w[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+(Base[ 	]+|[ 	]*)(0x[0-9a-f]+ )?foo
diff --git a/ld/testsuite/ld-elfweak/dsowdata.dsym b/ld/testsuite/ld-elfweak/dsowdata.dsym
index e0f579ae12..5fdc6940b6 100644
--- a/ld/testsuite/ld-elfweak/dsowdata.dsym
+++ b/ld/testsuite/ld-elfweak/dsowdata.dsym
@@ -1 +1 @@
-[0-9a-f]*[ 	]+w[ 	]+DO[ 	]+.(s|)data[	]+[0-9a-f]*[ 	]+(Base[ 	]+|[ 	]*)deallocate_foo
+[0-9a-f]+[ 	]+w[ 	]+DO[ 	]+\.s?data[	]+[0-9a-f]+[ 	]+(Base[ 	]+|[ 	]*)deallocate_foo
diff --git a/ld/testsuite/ld-elfweak/elfweak.exp b/ld/testsuite/ld-elfweak/elfweak.exp
index 4953b91658..cac613b725 100644
--- a/ld/testsuite/ld-elfweak/elfweak.exp
+++ b/ld/testsuite/ld-elfweak/elfweak.exp
@@ -41,9 +41,9 @@ if {    ![istarget alpha*-*-linux*] \
      && ![istarget m68k-*-linux*] \
      && ![istarget mips*-*-irix5*] \
      && ![istarget mips*-*-linux*] \
-     && ![istarget powerpc-*-elf*] \
-     && ![istarget powerpc-*-linux*] \
-     && ![istarget powerpc-*-sysv4*] \
+     && ![istarget powerpc*-*-elf*] \
+     && ![istarget powerpc*-*-linux*] \
+     && ![istarget powerpc*-*-sysv4*] \
      && ![istarget sh\[34\]*-*-linux*] \
      && ![istarget sparc*-*-elf] \
      && ![istarget sparc*-*-solaris2*] \
diff --git a/ld/testsuite/ld-elfweak/strong.sym b/ld/testsuite/ld-elfweak/strong.sym
index 85e06f7723..531d35876f 100644
--- a/ld/testsuite/ld-elfweak/strong.sym
+++ b/ld/testsuite/ld-elfweak/strong.sym
@@ -1 +1 @@
-[0-9a-f]*[ 	]+g[ 	]+F[ 	]+.text[	]+[0-9a-f]*[ 	]+(0x[0-9a-f]*|)[ 	]*foo
+[0-9a-f]+[ 	]+g[ 	]+F[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+(0x[0-9a-f]+ )?foo
diff --git a/ld/testsuite/ld-elfweak/strongcomm.sym b/ld/testsuite/ld-elfweak/strongcomm.sym
index c0ae401498..2a8c6cd287 100644
--- a/ld/testsuite/ld-elfweak/strongcomm.sym
+++ b/ld/testsuite/ld-elfweak/strongcomm.sym
@@ -1,2 +1,2 @@
-[0-9a-f]*[ 	]+g[ 	]+O[ 	]+.(s|)bss[	]+[0-9a-f]*[ 	]+deallocate_foo
-[0-9a-f]*[ 	]+g[ 	]+F[ 	]+.text[	]+[0-9a-f]*[ 	]+(0x[0-9a-f]*|)[ 	]*foo
+[0-9a-f]+[ 	]+g[ 	]+O[ 	]+\.s?bss[	]+[0-9a-f]+[ 	]+deallocate_foo
+[0-9a-f]+[ 	]+g[ 	]+F[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+(0x[0-9a-f]+ )?foo
diff --git a/ld/testsuite/ld-elfweak/strongdata.sym b/ld/testsuite/ld-elfweak/strongdata.sym
index 9b94377c84..88aa1c9def 100644
--- a/ld/testsuite/ld-elfweak/strongdata.sym
+++ b/ld/testsuite/ld-elfweak/strongdata.sym
@@ -1,2 +1,2 @@
-[0-9a-f]*[ 	]+g[ 	]+O[ 	]+.(s|)(data|bss)[	]+[0-9a-f]*[ 	]+deallocate_foo
-[0-9a-f]*[ 	]+g[ 	]+F[ 	]+.text[	]+[0-9a-f]*[ 	]+(0x[0-9a-f]*|)[ 	]*foo
+[0-9a-f]+[ 	]+g[ 	]+O[ 	]+\.s?(data|bss)[	]+[0-9a-f]+[ 	]+deallocate_foo
+[0-9a-f]+[ 	]+g[ 	]+F[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+(0x[0-9a-f]+ )?foo
diff --git a/ld/testsuite/ld-elfweak/weak.dsym b/ld/testsuite/ld-elfweak/weak.dsym
index cc36c6f313..e3aa87ae22 100644
--- a/ld/testsuite/ld-elfweak/weak.dsym
+++ b/ld/testsuite/ld-elfweak/weak.dsym
@@ -1 +1 @@
-[0-9a-f]*[ 	]+w[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+(Base[ 	]+|[ 	]*)(0x[0-9a-f]+|)[ 	]*foo
+[0-9a-f]+[ 	]+w[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+(Base[ 	]+|[ 	]*)(0x[0-9a-f]+ )?foo
diff --git a/ld/testsuite/ld-elfweak/weakdata.dsym b/ld/testsuite/ld-elfweak/weakdata.dsym
index e0f579ae12..5fdc6940b6 100644
--- a/ld/testsuite/ld-elfweak/weakdata.dsym
+++ b/ld/testsuite/ld-elfweak/weakdata.dsym
@@ -1 +1 @@
-[0-9a-f]*[ 	]+w[ 	]+DO[ 	]+.(s|)data[	]+[0-9a-f]*[ 	]+(Base[ 	]+|[ 	]*)deallocate_foo
+[0-9a-f]+[ 	]+w[ 	]+DO[ 	]+\.s?data[	]+[0-9a-f]+[ 	]+(Base[ 	]+|[ 	]*)deallocate_foo