Enable more ld tests for PowerPC64

Alan Modra amodra@gmail.com
Thu Oct 28 09:08:00 GMT 2010


I should pay more attention to test summary lines.  The ld-elfvers,
ld-elfweak, and ld-shared tests were not being run for powerpc64.
PowerPC64 certainly supports those features.  All that is required is
some tweaking to match function symbols in the .opd section rather
than .text.

	* 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.

Index: ld/testsuite/ld-elfvers/vers.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers.exp,v
retrieving revision 1.47
diff -u -p -r1.47 vers.exp
--- ld/testsuite/ld-elfvers/vers.exp	6 Apr 2010 11:53:16 -0000	1.47
+++ ld/testsuite/ld-elfvers/vers.exp	28 Oct 2010 08:08:35 -0000
@@ -39,9 +39,9 @@ if { ![istarget hppa*64*-*-hpux*] \
      && ![istarget ia64-*-linux*] \
      && ![istarget m68k-*-linux*] \
      && ![istarget mips*-*-irix5*] \
-     && ![istarget powerpc-*-elf*] \
-     && ![istarget powerpc-*-linux*] \
-     && ![istarget powerpc-*-sysv4*] \
+     && ![istarget powerpc*-*-elf*] \
+     && ![istarget powerpc*-*-linux*] \
+     && ![istarget powerpc*-*-sysv4*] \
      && ![istarget sparc*-*-elf] \
      && ![istarget sparc*-*-solaris2*] \
      && ![istarget sparc*-*-linux*] \
Index: ld/testsuite/ld-elfvers/vers1.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers1.dsym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers1.dsym
--- ld/testsuite/ld-elfvers/vers1.dsym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers1.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,9 +1,9 @@
-[0]* g    DO \*ABS\*	[0]*  VERS_1.1    VERS_1.1
-[0]* g    DO \*ABS\*	[0]*  VERS_1.2    VERS_1.2
-[0]* g    DO \*ABS\*	[0]*  VERS_2.0    VERS_2.0
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(Base\)       (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(VERS_1.1\)   (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(VERS_1.2\)   (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]* g    DO (.s?data|\*ABS\*)	[0-9a-f]*  VERS_2.0    show_bar1
-[0-9a-f]* g    DO (.s?data|\*ABS\*)	[0-9a-f]*  VERS_2.0    show_bar2
+0+ g +DO \*ABS\*	0+ +VERS_1\.1 +VERS_1\.1
+0+ g +DO \*ABS\*	0+ +VERS_1\.2 +VERS_1\.2
+0+ g +DO \*ABS\*	0+ +VERS_2\.0 +VERS_2\.0
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ \(Base\) +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ \(VERS_1\.1\) +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ \(VERS_1\.2\) +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_2\.0 +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ g +DO (\.s?data|\*ABS\*)	[0-9a-f]+ +VERS_2\.0 +show_bar1
+[0-9a-f]+ g +DO (\.s?data|\*ABS\*)	[0-9a-f]+ +VERS_2\.0 +show_bar2
Index: ld/testsuite/ld-elfvers/vers1.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers1.sym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers1.sym
--- ld/testsuite/ld-elfvers/vers1.sym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers1.sym	28 Oct 2010 08:08:35 -0000
@@ -1,4 +1,4 @@
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@VERS_1.1
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@VERS_1.2
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@@VERS_2.0
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@VERS_1\.1
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@VERS_1\.2
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@@VERS_2\.0
Index: ld/testsuite/ld-elfvers/vers15.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers15.dsym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers15.dsym
--- ld/testsuite/ld-elfvers/vers15.dsym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers15.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,5 +1,5 @@
-[0]* g    DO \*ABS\*	[0]*  VERS_1.1    VERS_1.1
-[0]* g    DO \*ABS\*	[0]*  VERS_1.2    VERS_1.2
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(Base\)       (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(VERS_1.1\)   (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_1.2    (0x[0-9a-f][0-9a-f] )?show_foo
+0+ g +DO \*ABS\*	0+ +VERS_1\.1 +VERS_1\.1
+0+ g +DO \*ABS\*	0+ +VERS_1\.2 +VERS_1\.2
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ \(Base\) +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ \(VERS_1\.1\) +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_1\.2 +(0x[0-9a-f]+ )?show_foo
Index: ld/testsuite/ld-elfvers/vers15.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers15.sym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers15.sym
--- ld/testsuite/ld-elfvers/vers15.sym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers15.sym	28 Oct 2010 08:08:35 -0000
@@ -1,3 +1,3 @@
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@VERS_1.1
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@@VERS_1.2
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@VERS_1\.1
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@@VERS_1\.2
Index: ld/testsuite/ld-elfvers/vers16.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers16.dsym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers16.dsym
--- ld/testsuite/ld-elfvers/vers16.dsym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers16.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0-9a-f]* g    DF (\.text|\*ABS\*)	[0-9a-f]*(  Base       )? (0x[0-9a-f][0-9a-f] )?show_bar
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*(             )? (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+( +Base +)? (0x[0-9a-f]+ )?show_bar
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +(0x[0-9a-f]+ )?show_foo
Index: ld/testsuite/ld-elfvers/vers16a.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers16a.dsym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers16a.dsym
--- ld/testsuite/ld-elfvers/vers16a.dsym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers16a.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,3 +1,3 @@
-[0-9a-f]* g    DO (\.text|\*ABS\*)	[0-9a-f]*  VERS_1\.1    VERS_1\.1
-[0-9a-f]* g    DF (\.text|\*ABS\*)	[0-9a-f]*  VERS_1\.1    (0x[0-9a-f][0-9a-f] )?show_bar
-[0-9a-f]* g    DF (\.text|\*ABS\*)	[0-9a-f]*  Base        (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]+ g +DO (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_1\.1 +VERS_1\.1
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_1\.1 +(0x[0-9a-f]+ )?show_bar
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +Base +(0x[0-9a-f]+ )?show_foo
Index: ld/testsuite/ld-elfvers/vers17.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers17.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers17.dsym
--- ld/testsuite/ld-elfvers/vers17.dsym	7 Jul 1999 15:36:28 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers17.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]* g    DO \*ABS\*	[0]*  VERS_2.0    VERS_2.0
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
+0+ g +DO \*ABS\*	0+ +VERS_2\.0 +VERS_2\.0
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_2\.0 +(0x[0-9a-f]+ )?show_foo
Index: ld/testsuite/ld-elfvers/vers18.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers18.dsym,v
retrieving revision 1.2
diff -u -p -r1.2 vers18.dsym
--- ld/testsuite/ld-elfvers/vers18.dsym	5 May 2003 03:33:09 -0000	1.2
+++ ld/testsuite/ld-elfvers/vers18.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,7 +1,7 @@
-[0]* g    DO \*ABS\*	[0]*  VERS_1.1    VERS_1.1
-[0]* g    DO \*ABS\*	[0]*  VERS_1.2    VERS_1.2
-[0]* g    DO \*ABS\*	[0]*  VERS_2.0    VERS_2.0
-[0-9a-f]*  w   DF (.text|\*ABS\*)	[0-9a-f]* \(Base\)       (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]*  w   DF (.text|\*ABS\*)	[0-9a-f]* \(VERS_1.1\)   (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]*  w   DF (.text|\*ABS\*)	[0-9a-f]* \(VERS_1.2\)   (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]*  w   DF (.text|\*ABS\*)	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
+0+ g +DO \*ABS\*	0+ +VERS_1\.1 +VERS_1\.1
+0+ g +DO \*ABS\*	0+ +VERS_1\.2 +VERS_1\.2
+0+ g +DO \*ABS\*	0+ +VERS_2\.0 +VERS_2\.0
+[0-9a-f]+ +w +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ \(Base\) +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ +w +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ \(VERS_1\.1\) +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ +w +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ \(VERS_1\.2\) +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ +w +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_2\.0 +(0x[0-9a-f]+ )?show_foo
Index: ld/testsuite/ld-elfvers/vers18.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers18.sym,v
retrieving revision 1.1
diff -u -p -r1.1 vers18.sym
--- ld/testsuite/ld-elfvers/vers18.sym	7 Jul 1999 15:36:29 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers18.sym	28 Oct 2010 08:08:35 -0000
@@ -1,4 +1,4 @@
-[0-9a-f]*  w    F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@
-[0-9a-f]*  w    F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@VERS_1.1
-[0-9a-f]*  w    F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@VERS_1.2
-[0-9a-f]*  w    F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_foo@@VERS_2.0
+[0-9a-f]+ +w +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@
+[0-9a-f]+ +w +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@VERS_1\.1
+[0-9a-f]+ +w +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@VERS_1\.2
+[0-9a-f]+ +w +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_foo@@VERS_2\.0
Index: ld/testsuite/ld-elfvers/vers19.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers19.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers19.dsym
--- ld/testsuite/ld-elfvers/vers19.dsym	7 Jul 1999 15:36:29 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers19.dsym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +VERS_2\.0 +(0x[0-9a-f]+ )?show_foo
Index: ld/testsuite/ld-elfvers/vers2.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers2.dsym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers2.dsym
--- ld/testsuite/ld-elfvers/vers2.dsym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers2.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,3 +1,3 @@
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
-[0]* g    DO \*ABS\*	[0]*  VERS_XXX_1.1 VERS_XXX_1.1
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_XXX_1.1 (0x[0-9a-f][0-9a-f] )?show_xyzzy
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +VERS_2\.0 +(0x[0-9a-f]+ )?show_foo
+0+ g +DO \*ABS\*	0+ +VERS_XXX_1\.1 VERS_XXX_1\.1
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_XXX_1\.1 (0x[0-9a-f]+ )?show_xyzzy
Index: ld/testsuite/ld-elfvers/vers20.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers20.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers20.dsym
--- ld/testsuite/ld-elfvers/vers20.dsym	30 Nov 2001 08:07:34 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers20.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS_1.1[ 	]+VERS_1.1
-[0-9a-f]*[ 	]+g[ 	]+DO[ 	]+.(s|)bss[	]+[0-9a-f]*[ 	]+VERS_1.1[ 	]+show_foo
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS_1\.1[ 	]+VERS_1\.1
+[0-9a-f]+[ 	]+g[ 	]+DO[ 	]+\.s?bss[	]+[0-9a-f]+[ 	]+VERS_1\.1[ 	]+show_foo
Index: ld/testsuite/ld-elfvers/vers21.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers21.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers21.dsym
--- ld/testsuite/ld-elfvers/vers21.dsym	16 Jul 2002 00:15:57 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers21.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,4 +1,4 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS.0[ 	]+VERS.0
-[0-9a-f]*[ 	]+w[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+\(VERS.0\)[ 	]+(0x[0-9a-f]*|)[ 	]*bar
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+\(VERS.0\)[ 	]+(0x[0-9a-f]*|)[ 	]*foo
-[0-9a-f]*[ 	]+g[ 	]+DO[ 	]+.s?data[	]+[0-9a-f]*[ 	]+\(VERS.0\)[ 	]+foobar
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS\.0[ 	]+VERS\.0
+[0-9a-f]+[ 	]+w[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+\(VERS\.0\)[ 	]+(0x[0-9a-f]+|)[ 	]*bar
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+\(VERS\.0\)[ 	]+(0x[0-9a-f]+|)[ 	]*foo
+[0-9a-f]+[ 	]+g[ 	]+DO[ 	]+\.s?data[	]+[0-9a-f]+[ 	]+\(VERS\.0\)[ 	]+foobar
Index: ld/testsuite/ld-elfvers/vers21.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers21.sym,v
retrieving revision 1.1
diff -u -p -r1.1 vers21.sym
--- ld/testsuite/ld-elfvers/vers21.sym	16 Jul 2002 00:15:57 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers21.sym	28 Oct 2010 08:08:35 -0000
@@ -1,3 +1,3 @@
-[0-9a-f]*[ 	]+g[ 	]+O[ 	]+.s?data[ 	]+[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foobar@VERS.0
-[0-9a-f]*[ 	]+w[ 	]+F[ 	]+.text[ 	]+[0-9a-f]* (0x[0-9a-f][0-9a-f] )?bar@VERS.0
-[0-9a-f]*[ 	]+g[ 	]+F[ 	]+.text[ 	]+[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@VERS.0
+[0-9a-f]+[ 	]+g[ 	]+O[ 	]+\.s?data[ 	]+[0-9a-f]+ (0x[0-9a-f]+ )?foobar@VERS\.0
+[0-9a-f]+[ 	]+w[ 	]+F[ 	]+\.(text|opd)[ 	]+[0-9a-f]+ (0x[0-9a-f]+ )?bar@VERS\.0
+[0-9a-f]+[ 	]+g[ 	]+F[ 	]+\.(text|opd)[ 	]+[0-9a-f]+ (0x[0-9a-f]+ )?foo@VERS\.0
Index: ld/testsuite/ld-elfvers/vers22.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers22.dsym,v
retrieving revision 1.2
diff -u -p -r1.2 vers22.dsym
--- ld/testsuite/ld-elfvers/vers22.dsym	9 Aug 2002 04:56:20 -0000	1.2
+++ ld/testsuite/ld-elfvers/vers22.dsym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS.0      (0x[0-9a-f][0-9a-f] )?bar
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +VERS\.0 +(0x[0-9a-f]+ )?bar
Index: ld/testsuite/ld-elfvers/vers22a.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers22a.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers22a.dsym
--- ld/testsuite/ld-elfvers/vers22a.dsym	9 Aug 2002 04:42:44 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers22a.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS.0[ 	]+VERS.0
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+\(VERS.0\)[ 	]+(0x[0-9a-f]*|)[ 	]*bar
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS\.0[ 	]+VERS\.0
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+\(VERS\.0\)[ 	]+(0x[0-9a-f]+ )?bar
Index: ld/testsuite/ld-elfvers/vers22a.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers22a.sym,v
retrieving revision 1.1
diff -u -p -r1.1 vers22a.sym
--- ld/testsuite/ld-elfvers/vers22a.sym	9 Aug 2002 04:42:44 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers22a.sym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]*[ 	]+g[ 	]+F[ 	]+.text[ 	]+[0-9a-f]* (0x[0-9a-f][0-9a-f] )?bar@VERS.0
+[0-9a-f]+[ 	]+g[ 	]+F[ 	]+\.(text|opd)[ 	]+[0-9a-f]+ (0x[0-9a-f]+ )?bar@VERS.0
Index: ld/testsuite/ld-elfvers/vers22b.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers22b.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers22b.dsym
--- ld/testsuite/ld-elfvers/vers22b.dsym	9 Aug 2002 04:42:44 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers22b.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS.0[ 	]+VERS.0
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+VERS.0[ 	]+(0x[0-9a-f]*|)[ 	]*bar
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS\.0[ 	]+VERS\.0
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+VERS\.0[ 	]+(0x[0-9a-f]+ )?bar
Index: ld/testsuite/ld-elfvers/vers23.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers23.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers23.dsym
--- ld/testsuite/ld-elfvers/vers23.dsym	12 Aug 2002 19:21:59 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers23.dsym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS.0      (0x[0-9a-f][0-9a-f] )?foo
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +VERS\.0 +(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers23a.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers23a.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers23a.dsym
--- ld/testsuite/ld-elfvers/vers23a.dsym	12 Aug 2002 19:21:59 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers23a.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,3 +1,3 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS.0[ 	]+VERS.0
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+\(VERS.0\)[ 	]+(0x[0-9a-f]*|)[ 	]*bar
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+VERS.0[ 	]+(0x[0-9a-f]*|)[ 	]*foo
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS\.0[ 	]+VERS\.0
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+\(VERS\.0\)[ 	]+(0x[0-9a-f]+ )?bar
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+VERS\.0[ 	]+(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers23a.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers23a.sym,v
retrieving revision 1.1
diff -u -p -r1.1 vers23a.sym
--- ld/testsuite/ld-elfvers/vers23a.sym	12 Aug 2002 19:21:59 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers23a.sym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]*[ 	]+g[ 	]+F[ 	]+.text[ 	]+[0-9a-f]* (0x[0-9a-f][0-9a-f] )?bar@VERS.0
+[0-9a-f]+[ 	]+g[ 	]+F[ 	]+\.(text|opd)[ 	]+[0-9a-f]+ (0x[0-9a-f]+ )?bar@VERS.0
Index: ld/testsuite/ld-elfvers/vers23b.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers23b.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers23b.dsym
--- ld/testsuite/ld-elfvers/vers23b.dsym	12 Aug 2002 19:21:59 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers23b.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS.0[ 	]+VERS.0
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+VERS.0[ 	]+(0x[0-9a-f]*|)[ 	]*bar
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS\.0[ 	]+VERS\.0
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+VERS\.0[ 	]+(0x[0-9a-f]+ )?bar
Index: ld/testsuite/ld-elfvers/vers25a.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers25a.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers25a.dsym
--- ld/testsuite/ld-elfvers/vers25a.dsym	23 Apr 2003 16:40:04 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers25a.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS.0[ 	]+VERS.0
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+VERS.0[ 	]+(0x[0-9a-f]*|)[ 	]*foo
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS\.0[ 	]+VERS\.0
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+VERS\.0[ 	]+(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers26a.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers26a.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers26a.dsym
--- ld/testsuite/ld-elfvers/vers26a.dsym	28 Apr 2003 16:58:00 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers26a.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS.0[ 	]+VERS.0
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+VERS.0[ 	]+(0x[0-9a-f]*|)[ 	]*foo
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS\.0[ 	]+VERS\.0
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+VERS\.0[ 	]+(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers27a.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers27a.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers27a.dsym
--- ld/testsuite/ld-elfvers/vers27a.dsym	3 May 2003 16:51:05 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers27a.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS.0[ 	]+VERS.0
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+VERS.0[ 	]+(0x[0-9a-f]*|)[ 	]*foo
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS\.0[ 	]+VERS\.0
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+VERS\.0[ 	]+(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers27d.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers27d.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers27d.dsym
--- ld/testsuite/ld-elfvers/vers27d.dsym	8 May 2003 05:10:47 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers27d.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS.0[ 	]+VERS.0
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+\(VERS.0\)[ 	]+(0x[0-9a-f]*|)[ 	]*foo
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS\.0[ 	]+VERS\.0
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+\(VERS\.0\)[ 	]+(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers27d.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers27d.sym,v
retrieving revision 1.1
diff -u -p -r1.1 vers27d.sym
--- ld/testsuite/ld-elfvers/vers27d.sym	8 May 2003 05:10:47 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers27d.sym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]*[ 	]+g[ 	]+F[ 	]+.text[ 	]+[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@VERS.0
+[0-9a-f]+[ 	]+g[ 	]+F[ 	]+\.(text|opd)[ 	]+[0-9a-f]+ (0x[0-9a-f]+ )?foo@VERS\.0
Index: ld/testsuite/ld-elfvers/vers27d4.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers27d4.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers27d4.dsym
--- ld/testsuite/ld-elfvers/vers27d4.dsym	8 May 2003 19:51:48 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers27d4.dsym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS.0      (0x[0-9a-f][0-9a-f] )?foo
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +VERS\.0 +(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers28b.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers28b.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers28b.dsym
--- ld/testsuite/ld-elfvers/vers28b.dsym	19 Mar 2004 17:02:31 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers28b.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]*[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+[0]*[ 	]+VERS.0[ 	]+VERS.0
-[0-9a-f]*[ 	]+w[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+VERS.0[ 	]+(0x[0-9a-f]*|)[ 	]*foo
+0+[ 	]+g[ 	]+DO[ 	]+\*ABS\*[ 	]+0+[ 	]+VERS\.0[ 	]+VERS\.0
+[0-9a-f]+[ 	]+w[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+VERS\.0[ 	]+(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers28c.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers28c.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers28c.dsym
--- ld/testsuite/ld-elfvers/vers28c.dsym	19 Mar 2004 17:02:31 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers28c.dsym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]*[ 	]+DF[ 	]+\*UND\*[	]+[0-9a-f]*[ 	]+VERS.0[ 	]+(0x[0-9a-f]*|)[ 	]*foo
+[0-9a-f]+[ 	]+DF[ 	]+\*UND\*[	]+[0-9a-f]+[ 	]+VERS\.0[ 	]+(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers29.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers29.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers29.dsym
--- ld/testsuite/ld-elfvers/vers29.dsym	26 Oct 2004 21:00:23 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers29.dsym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]*[ 	]+g[ 	]+DF[ 	]+.text[	]+[0-9a-f]*[ 	]+vers29.so[ 	]+(0x[0-9a-f]*|)[ 	]*show
+[0-9a-f]+[ 	]+g[ 	]+DF[ 	]+\.(text|opd)[	]+[0-9a-f]+[ 	]+vers29\.so[ 	]+(0x[0-9a-f]+ )?show
Index: ld/testsuite/ld-elfvers/vers3.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers3.dsym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers3.dsym
--- ld/testsuite/ld-elfvers/vers3.dsym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers3.dsym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +VERS_2\.0 +(0x[0-9a-f]+ )?show_foo
Index: ld/testsuite/ld-elfvers/vers30.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers30.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers30.dsym
--- ld/testsuite/ld-elfvers/vers30.dsym	17 Aug 2005 10:08:30 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers30.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,5 +1,5 @@
-[0]* g    DO \*ABS\*	[0]*  VERS_30.0   VERS_30.0
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_30.0   global
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_30.0   foo
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_30.0   info
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_30.0   extern
+0+ g    DO \*ABS\*	0+  VERS_30\.0   VERS_30\.0
+[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+  VERS_30\.0   global
+[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+  VERS_30\.0   foo
+[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+  VERS_30\.0   info
+[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+  VERS_30\.0   extern
Index: ld/testsuite/ld-elfvers/vers31.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers31.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers31.dsym
--- ld/testsuite/ld-elfvers/vers31.dsym	13 Oct 2005 17:29:57 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers31.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]* g    DO \*ABS\*	[0]*  VERS_31.0   VERS_31.0
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_31.0   _Z1fIA3_icEvPT_T0
+0+ g +DO \*ABS\*	0+ +VERS_31\.0 +VERS_31\.0
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_31\.0 +_Z1fIA3_icEvPT_T0
Index: ld/testsuite/ld-elfvers/vers32a.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers32a.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers32a.dsym
--- ld/testsuite/ld-elfvers/vers32a.dsym	10 Jul 2007 14:51:55 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers32a.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]* g    DO \*ABS\*	[0]*  VERS_1      VERS_1
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_1      (0x[0-9a-f][0-9a-f] )?foo
+0+ g +DO \*ABS\*	0+ +VERS_1 +VERS_1
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_1 +(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers32b.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers32b.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers32b.dsym
--- ld/testsuite/ld-elfvers/vers32b.dsym	10 Jul 2007 14:51:55 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers32b.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0-9a-f]* g    D  \*ABS\*	[0-9a-f]*  VERS_1      (0x[0-9a-f][0-9a-f] )?foo
-[0]* g    DO \*ABS\*	[0]*  VERS_1      VERS_1
+[0-9a-f]+ g +D +\*ABS\*	[0-9a-f]+ +VERS_1 +(0x[0-9a-f]+ )?foo
+0+ g +DO \*ABS\*	0+ +VERS_1 +VERS_1
Index: ld/testsuite/ld-elfvers/vers32c.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers32c.dsym,v
retrieving revision 1.1
diff -u -p -r1.1 vers32c.dsym
--- ld/testsuite/ld-elfvers/vers32c.dsym	10 Jul 2007 14:51:55 -0000	1.1
+++ ld/testsuite/ld-elfvers/vers32c.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0-9a-f]* g    DF \*ABS\*	[0-9a-f]*  VERS_1      (0x[0-9a-f][0-9a-f] )?foo
-[0]* g    DO \*ABS\*	[0]*  VERS_1      VERS_1
+[0-9a-f]+ g +DF \*ABS\*	[0-9a-f]+ +VERS_1 +(0x[0-9a-f]+ )?foo
+0+ g +DO \*ABS\*	0+ +VERS_1 +VERS_1
Index: ld/testsuite/ld-elfvers/vers4.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers4.sym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers4.sym
--- ld/testsuite/ld-elfvers/vers4.sym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers4.sym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@@VERS_2.0
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?foo@@VERS_2\.0
Index: ld/testsuite/ld-elfvers/vers4a.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers4a.dsym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers4a.dsym
--- ld/testsuite/ld-elfvers/vers4a.dsym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers4a.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]* g    DO \*ABS\*	[0]*  VERS_2.0    VERS_2.0
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?foo
+0+ g    DO \*ABS\*	0+  VERS_2\.0    VERS_2\.0
+[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+  VERS_2\.0    (0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers4a.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers4a.sym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers4a.sym
--- ld/testsuite/ld-elfvers/vers4a.sym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers4a.sym	28 Oct 2010 08:08:35 -0000
@@ -1 +1 @@
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@@VERS_2.0
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?foo@@VERS_2\.0
Index: ld/testsuite/ld-elfvers/vers6.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers6.dsym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers6.dsym
--- ld/testsuite/ld-elfvers/vers6.dsym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers6.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,4 +1,4 @@
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*              (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_2.0    (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_1.2    (0x[0-9a-f][0-9a-f] )?show_foo
-[0-9a-f]*      DF \*UND\*	[0-9a-f]*  VERS_1.1    (0x[0-9a-f][0-9a-f] )?show_foo
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +VERS_2.0 +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +VERS_1.2 +(0x[0-9a-f]+ )?show_foo
+[0-9a-f]+ +DF \*UND\*	[0-9a-f]+ +VERS_1.1 +(0x[0-9a-f]+ )?show_foo
Index: ld/testsuite/ld-elfvers/vers6.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers6.sym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers6.sym
--- ld/testsuite/ld-elfvers/vers6.sym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers6.sym	28 Oct 2010 08:08:35 -0000
@@ -1,4 +1,4 @@
-[0]* *F? *\*UND\*	[0]* show_foo@
-[0]* *F? *\*UND\*	[0]* show_foo@VERS_1.1
-[0]* *F? *\*UND\*	[0]* show_foo@VERS_1.2
-[0]* *F? *\*UND\*	[0]* show_foo@VERS_2.0
+0+ *F? *\*UND\*	0+ show_foo@
+0+ *F? *\*UND\*	0+ show_foo@VERS_1\.1
+0+ *F? *\*UND\*	0+ show_foo@VERS_1\.2
+0+ *F? *\*UND\*	0+ show_foo@VERS_2\.0
Index: ld/testsuite/ld-elfvers/vers7a.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers7a.dsym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers7a.dsym
--- ld/testsuite/ld-elfvers/vers7a.dsym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers7a.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0]* g    DO \*ABS\*	[0]*  VERS_1      VERS_1
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_1      (0x[0-9a-f][0-9a-f] )?show_b
+0+ g +DO \*ABS\*	0+ +VERS_1 +VERS_1
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_1 +(0x[0-9a-f]+ )?show_b
Index: ld/testsuite/ld-elfvers/vers7a.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers7a.sym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers7a.sym
--- ld/testsuite/ld-elfvers/vers7a.sym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers7a.sym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?hide_a@@VERS_1
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?show_b@@VERS_1
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?hide_a@@VERS_1
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?show_b@@VERS_1
Index: ld/testsuite/ld-elfvers/vers9.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers9.dsym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers9.dsym
--- ld/testsuite/ld-elfvers/vers9.dsym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers9.dsym	28 Oct 2010 08:08:35 -0000
@@ -1,4 +1,4 @@
-[0]* g    DO \*ABS\*	[0]*  VERS_1.1    VERS_1.1
-[0]* g    DO \*ABS\*	[0]*  VERS_1.2    VERS_1.2
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]* \(VERS_1.1\)   (0x[0-9a-f][0-9a-f] )?foo
-[0-9a-f]* g    DF (.text|\*ABS\*)	[0-9a-f]*  VERS_1.2    (0x[0-9a-f][0-9a-f] )?foo
+0+ g +DO \*ABS\*	0+ +VERS_1\.1 +VERS_1\.1
+0+ g +DO \*ABS\*	0+ +VERS_1\.2 +VERS_1\.2
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ \(VERS_1\.1\) +(0x[0-9a-f]+ )?foo
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*)	[0-9a-f]+ +VERS_1\.2 +(0x[0-9a-f]+ )?foo
Index: ld/testsuite/ld-elfvers/vers9.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfvers/vers9.sym,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vers9.sym
--- ld/testsuite/ld-elfvers/vers9.sym	3 May 1999 07:29:08 -0000	1.1.1.1
+++ ld/testsuite/ld-elfvers/vers9.sym	28 Oct 2010 08:08:35 -0000
@@ -1,4 +1,4 @@
-[0]* *F? *\*UND\*	[0]* foo@VERS_1.2
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@VERS_1.1
-[0-9a-f]* g     F .text	[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@@VERS_1.2
+0+ *F? *\*UND\*	0+ foo@VERS_1\.2
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?foo@
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?foo@VERS_1\.1
+[0-9a-f]+ g +F \.(text|opd)	[0-9a-f]+ (0x[0-9a-f]+ )?foo@@VERS_1\.2
Index: ld/testsuite/ld-elfweak/dso.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/dso.dsym,v
retrieving revision 1.3
diff -u -p -r1.3 dso.dsym
--- ld/testsuite/ld-elfweak/dso.dsym	25 Sep 2001 20:24:00 -0000	1.3
+++ ld/testsuite/ld-elfweak/dso.dsym	28 Oct 2010 08:08:35 -0000
@@ -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
Index: ld/testsuite/ld-elfweak/dsodata.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/dsodata.dsym,v
retrieving revision 1.3
diff -u -p -r1.3 dsodata.dsym
--- ld/testsuite/ld-elfweak/dsodata.dsym	11 Mar 2002 09:26:20 -0000	1.3
+++ ld/testsuite/ld-elfweak/dsodata.dsym	28 Oct 2010 08:08:35 -0000
@@ -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
Index: ld/testsuite/ld-elfweak/dsow.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/dsow.dsym,v
retrieving revision 1.3
diff -u -p -r1.3 dsow.dsym
--- ld/testsuite/ld-elfweak/dsow.dsym	22 May 2005 21:02:19 -0000	1.3
+++ ld/testsuite/ld-elfweak/dsow.dsym	28 Oct 2010 08:08:35 -0000
@@ -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
Index: ld/testsuite/ld-elfweak/dsowdata.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/dsowdata.dsym,v
retrieving revision 1.2
diff -u -p -r1.2 dsowdata.dsym
--- ld/testsuite/ld-elfweak/dsowdata.dsym	5 May 2003 03:33:09 -0000	1.2
+++ ld/testsuite/ld-elfweak/dsowdata.dsym	28 Oct 2010 08:08:35 -0000
@@ -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
Index: ld/testsuite/ld-elfweak/elfweak.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/elfweak.exp,v
retrieving revision 1.14
diff -u -p -r1.14 elfweak.exp
--- ld/testsuite/ld-elfweak/elfweak.exp	2 Sep 2009 07:25:39 -0000	1.14
+++ ld/testsuite/ld-elfweak/elfweak.exp	28 Oct 2010 08:08:35 -0000
@@ -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*] \
Index: ld/testsuite/ld-elfweak/strong.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/strong.sym,v
retrieving revision 1.2
diff -u -p -r1.2 strong.sym
--- ld/testsuite/ld-elfweak/strong.sym	25 Sep 2001 20:24:00 -0000	1.2
+++ ld/testsuite/ld-elfweak/strong.sym	28 Oct 2010 08:08:35 -0000
@@ -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
Index: ld/testsuite/ld-elfweak/strongcomm.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/strongcomm.sym,v
retrieving revision 1.2
diff -u -p -r1.2 strongcomm.sym
--- ld/testsuite/ld-elfweak/strongcomm.sym	25 Sep 2001 20:24:00 -0000	1.2
+++ ld/testsuite/ld-elfweak/strongcomm.sym	28 Oct 2010 08:08:35 -0000
@@ -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
Index: ld/testsuite/ld-elfweak/strongdata.sym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/strongdata.sym,v
retrieving revision 1.3
diff -u -p -r1.3 strongdata.sym
--- ld/testsuite/ld-elfweak/strongdata.sym	11 Mar 2002 09:26:20 -0000	1.3
+++ ld/testsuite/ld-elfweak/strongdata.sym	28 Oct 2010 08:08:35 -0000
@@ -1,2 +1,2 @@ you actually reviewed this? wow!!
-[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
Index: ld/testsuite/ld-elfweak/weak.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/weak.dsym,v
retrieving revision 1.2
diff -u -p -r1.2 weak.dsym
--- ld/testsuite/ld-elfweak/weak.dsym	22 May 2005 21:02:19 -0000	1.2
+++ ld/testsuite/ld-elfweak/weak.dsym	28 Oct 2010 08:08:35 -0000
@@ -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
Index: ld/testsuite/ld-elfweak/weakdata.dsym
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elfweak/weakdata.dsym,v
retrieving revision 1.3
diff -u -p -r1.3 weakdata.dsym
--- ld/testsuite/ld-elfweak/weakdata.dsym	5 May 2003 03:33:09 -0000	1.3
+++ ld/testsuite/ld-elfweak/weakdata.dsym	28 Oct 2010 08:08:35 -0000
@@ -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
Index: ld/testsuite/ld-shared/elf-offset.ld
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-shared/elf-offset.ld,v
retrieving revision 1.2
diff -u -p -r1.2 elf-offset.ld
--- ld/testsuite/ld-shared/elf-offset.ld	9 May 2003 15:35:09 -0000	1.2
+++ ld/testsuite/ld-shared/elf-offset.ld	28 Oct 2010 08:08:36 -0000
@@ -110,7 +110,7 @@ SECTIONS
     KEEP (*(SORT(.dtors.*)))
     KEEP (*(.dtors))
   }
-  .got           : { *(.got.plt) *(.got) }
+  .got           : ALIGN(8) { *(.got.plt) *(.got .toc) }
   .dynamic       : { *(.dynamic) }
   /* We want the small data sections together, so single-instruction offsets
      can access them all, and initialized data all before uninitialized, so
Index: ld/testsuite/ld-shared/shared.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-shared/shared.exp,v
retrieving revision 1.24
diff -u -p -r1.24 shared.exp
--- ld/testsuite/ld-shared/shared.exp	9 Feb 2010 10:46:27 -0000	1.24
+++ ld/testsuite/ld-shared/shared.exp	28 Oct 2010 08:08:36 -0000
@@ -43,9 +43,9 @@ if { ![istarget hppa*64*-*-hpux*] \
      && ![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 sparc*-*-elf] \
      && ![istarget sparc*-*-solaris2*] \
      && ![istarget sparc*-*-sunos4*] \
@@ -226,6 +226,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $
 	setup_xfail "*-*-sunos4*"
 	setup_xfail "ia64-*-linux*"
 	setup_xfail "alpha*-*-linux*"
+	setup_xfail "powerpc64*-*-*"
 	if { ![istarget hppa*64*-*-linux*] } {
 	    setup_xfail "hppa*-*-linux*"
 	}
@@ -245,7 +246,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $
 	# the load address is not zero (which is the default).
 	setup_xfail "*-*-sunos4*"
 	setup_xfail "*-*-linux*libc1"
-	setup_xfail "powerpc-*-linux*"
+	setup_xfail "powerpc*-*-linux*"
 	setup_xfail "ia64-*-linux*"
 	setup_xfail "alpha*-*-linux*"
 	setup_xfail "mips*-*-linux*"
@@ -301,6 +302,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG $p
 	    setup_xfail "*-*-sunos4*"
 	    setup_xfail "ia64-*-linux*"
 	    setup_xfail "alpha*-*-linux*"
+	    setup_xfail "powerpc64*-*-*"
 	    if { ![istarget hppa*64*-*-linux*] } {
 		setup_xfail "hppa*-*-linux*"
 	    }

-- 
Alan Modra
Australia Development Lab, IBM



More information about the Binutils mailing list