Adjust testcases for readelf addend change

gas/testsuite/

	* gas/mips/elf-rel10.d: Updated.
	* gas/mips/elf-rel22.d: Likewise.
	* gas/mmix/comment-1.d: Likewise.

ld/testsuite/

	* ld-alpha/tlspic.rd: Updated.
	* ld-powerpc/tlsso.r: Likewise.
	* ld-powerpc/tlsso32.r: Likewise.
	* ld-powerpc/vxworks1-lib.rd: Likewise.
	* ld-s390/tlspic.rd: Likewise.
	* ld-s390/tlspic_64.rd: Likewise.
	* ld-sh/shared-1.d: Likewise.
	* ld-sh/tlspic-2.d: Likewise.
	* ld-sparc/tlssunnopic32.rd: Likewise.
	* ld-sparc/tlssunnopic64.rd: Likewise.
	* ld-sparc/tlssunpic32.rd: Likewise.
	* ld-sparc/tlssunpic64.rd: Likewise.

13 files changed, 89 insertions, 74 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d7565b0..907e18f 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2012-05-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-alpha/tlspic.rd: Updated.
+	* ld-powerpc/tlsso.r: Likewise.
+	* ld-powerpc/tlsso32.r: Likewise.
+	* ld-powerpc/vxworks1-lib.rd: Likewise.
+	* ld-s390/tlspic.rd: Likewise.
+	* ld-s390/tlspic_64.rd: Likewise.
+	* ld-sh/shared-1.d: Likewise.
+	* ld-sh/tlspic-2.d: Likewise.
+	* ld-sparc/tlssunnopic32.rd: Likewise.
+	* ld-sparc/tlssunnopic64.rd: Likewise.
+	* ld-sparc/tlssunpic32.rd: Likewise.
+	* ld-sparc/tlssunpic64.rd: Likewise.
+
 2012-05-11  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld-cris/hiddef1.d: Updated.
diff --git a/ld/testsuite/ld-alpha/tlspic.rd b/ld/testsuite/ld-alpha/tlspic.rd
index ac6a38a..9a992b4 100644
--- a/ld/testsuite/ld-alpha/tlspic.rd
+++ b/ld/testsuite/ld-alpha/tlspic.rd
@@ -45,10 +45,10 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries:
 [0-9a-f]+ +[0-9a-f]+ R_ALPHA_DTPMOD64 +0+ sg1 \+ 0
 [0-9a-f]+ +[0-9a-f]+ R_ALPHA_DTPREL64 +0+ sg1 \+ 0
 [0-9a-f]+ +[0-9a-f]+ R_ALPHA_TPREL64 +0+4 sg2 \+ 0
-[0-9a-f]+ +[0-9a-f]+ R_ALPHA_TPREL64 +0+44
+[0-9a-f]+ +[0-9a-f]+ R_ALPHA_TPREL64 +44
 [0-9a-f]+ +[0-9a-f]+ R_ALPHA_DTPMOD64 +0+
 [0-9a-f]+ +[0-9a-f]+ R_ALPHA_DTPMOD64 +0+
-[0-9a-f]+ +[0-9a-f]+ R_ALPHA_TPREL64 +0+24
+[0-9a-f]+ +[0-9a-f]+ R_ALPHA_TPREL64 +24
 
 Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
diff --git a/ld/testsuite/ld-powerpc/tlsso.r b/ld/testsuite/ld-powerpc/tlsso.r
index 4167b3a..9171449 100644
--- a/ld/testsuite/ld-powerpc/tlsso.r
+++ b/ld/testsuite/ld-powerpc/tlsso.r
@@ -51,10 +51,10 @@ Relocation section '\.rela\.dyn' at offset .* contains 16 entries:
 [0-9a-f ]+R_PPC64_TPREL16_DS +0+105f8 \.tdata \+ 28
 [0-9a-f ]+R_PPC64_TPREL16_HA +0+105f8 \.tdata \+ 30
 [0-9a-f ]+R_PPC64_TPREL16_LO +0+105f8 \.tdata \+ 30
-[0-9a-f ]+R_PPC64_DTPMOD64 +0+
-[0-9a-f ]+R_PPC64_DTPREL64 +0+
-[0-9a-f ]+R_PPC64_DTPREL64 +0+18
-[0-9a-f ]+R_PPC64_DTPMOD64 +0+
+[0-9a-f ]+R_PPC64_DTPMOD64 +0
+[0-9a-f ]+R_PPC64_DTPREL64 +0
+[0-9a-f ]+R_PPC64_DTPREL64 +18
+[0-9a-f ]+R_PPC64_DTPMOD64 +0
 [0-9a-f ]+R_PPC64_DTPMOD64 +0+ gd \+ 0
 [0-9a-f ]+R_PPC64_DTPREL64 +0+ gd \+ 0
 [0-9a-f ]+R_PPC64_DTPREL64 +0+50 ld2 \+ 0
diff --git a/ld/testsuite/ld-powerpc/tlsso32.r b/ld/testsuite/ld-powerpc/tlsso32.r
index e075db2..1217d68 100644
--- a/ld/testsuite/ld-powerpc/tlsso32.r
+++ b/ld/testsuite/ld-powerpc/tlsso32.r
@@ -55,9 +55,9 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
 [0-9a-f ]+R_PPC_TPREL16 +0+103d0 +\.tdata \+ 103e4
 [0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +\.tdata \+ 103e8
 [0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +\.tdata \+ 103e8
-[0-9a-f ]+R_PPC_DTPMOD32 +0+
-[0-9a-f ]+R_PPC_DTPREL32 +0+
-[0-9a-f ]+R_PPC_DTPMOD32 +0+
+[0-9a-f ]+R_PPC_DTPMOD32 +0
+[0-9a-f ]+R_PPC_DTPREL32 +0
+[0-9a-f ]+R_PPC_DTPMOD32 +0
 [0-9a-f ]+R_PPC_DTPMOD32 +0+ +gd \+ 0
 [0-9a-f ]+R_PPC_DTPREL32 +0+ +gd \+ 0
 [0-9a-f ]+R_PPC_DTPMOD32 +0+1c +gd0 \+ 0
diff --git a/ld/testsuite/ld-powerpc/vxworks1-lib.rd b/ld/testsuite/ld-powerpc/vxworks1-lib.rd
index 40a5d55..21f7bc8 100644
--- a/ld/testsuite/ld-powerpc/vxworks1-lib.rd
+++ b/ld/testsuite/ld-powerpc/vxworks1-lib.rd
@@ -6,7 +6,7 @@ Relocation section '\.rela\.plt' at offset .* contains 2 entries:
 
 Relocation section '\.rela\.dyn' at offset .* contains 5 entries:
  Offset     Info    Type            Sym\.Value  Sym\. Name \+ Addend
-00090800  00000016 R_PPC_RELATIVE * 00080c44
+00090800  00000016 R_PPC_RELATIVE * 80c44
 00080c0e  .*06 R_PPC_ADDR16_HA   00000000   __GOTT_BASE__ \+ 0
 00080c12  .*04 R_PPC_ADDR16_LO   00000000   __GOTT_BASE__ \+ 0
 00080c16  .*03 R_PPC_ADDR16      00000000   __GOTT_INDEX__ \+ 0
diff --git a/ld/testsuite/ld-s390/tlspic.rd b/ld/testsuite/ld-s390/tlspic.rd
index ec63e3d..e118e3f 100644
--- a/ld/testsuite/ld-s390/tlspic.rd
+++ b/ld/testsuite/ld-s390/tlspic.rd
@@ -49,16 +49,16 @@ Program Headers:
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
  Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
-[0-9a-f ]+R_390_TLS_DTPMOD +0+
-[0-9a-f ]+R_390_TLS_TPOFF +0+24
-[0-9a-f ]+R_390_TLS_TPOFF +0+30
-[0-9a-f ]+R_390_TLS_DTPMOD +0+
-[0-9a-f ]+R_390_TLS_DTPMOD +0+
-[0-9a-f ]+R_390_TLS_TPOFF +0+64
-[0-9a-f ]+R_390_TLS_TPOFF +0+50
-[0-9a-f ]+R_390_TLS_TPOFF +0+70
-[0-9a-f ]+R_390_TLS_DTPMOD +0+
-[0-9a-f ]+R_390_TLS_TPOFF +0+44
+[0-9a-f ]+R_390_TLS_DTPMOD +0
+[0-9a-f ]+R_390_TLS_TPOFF +24
+[0-9a-f ]+R_390_TLS_TPOFF +30
+[0-9a-f ]+R_390_TLS_DTPMOD +0
+[0-9a-f ]+R_390_TLS_DTPMOD +0
+[0-9a-f ]+R_390_TLS_TPOFF +64
+[0-9a-f ]+R_390_TLS_TPOFF +50
+[0-9a-f ]+R_390_TLS_TPOFF +70
+[0-9a-f ]+R_390_TLS_DTPMOD +0
+[0-9a-f ]+R_390_TLS_TPOFF +44
 [0-9a-f ]+R_390_TLS_TPOFF +0+10 +sg5 \+ 0
 [0-9a-f ]+R_390_TLS_DTPMOD +0+ +sg1 \+ 0
 [0-9a-f ]+R_390_TLS_DTPOFF +0+ +sg1 \+ 0
diff --git a/ld/testsuite/ld-s390/tlspic_64.rd b/ld/testsuite/ld-s390/tlspic_64.rd
index da8c9bf..9a0c74b 100644
--- a/ld/testsuite/ld-s390/tlspic_64.rd
+++ b/ld/testsuite/ld-s390/tlspic_64.rd
@@ -49,16 +49,16 @@ Program Headers:
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_390_TLS_DTPMOD +0+
-[0-9a-f ]+R_390_TLS_TPOFF +0+24
-[0-9a-f ]+R_390_TLS_TPOFF +0+30
-[0-9a-f ]+R_390_TLS_DTPMOD +0+
-[0-9a-f ]+R_390_TLS_DTPMOD +0+
-[0-9a-f ]+R_390_TLS_TPOFF +0+64
-[0-9a-f ]+R_390_TLS_TPOFF +0+50
-[0-9a-f ]+R_390_TLS_TPOFF +0+70
-[0-9a-f ]+R_390_TLS_DTPMOD +0+
-[0-9a-f ]+R_390_TLS_TPOFF +0+44
+[0-9a-f ]+R_390_TLS_DTPMOD +0
+[0-9a-f ]+R_390_TLS_TPOFF +24
+[0-9a-f ]+R_390_TLS_TPOFF +30
+[0-9a-f ]+R_390_TLS_DTPMOD +0
+[0-9a-f ]+R_390_TLS_DTPMOD +0
+[0-9a-f ]+R_390_TLS_TPOFF +64
+[0-9a-f ]+R_390_TLS_TPOFF +50
+[0-9a-f ]+R_390_TLS_TPOFF +70
+[0-9a-f ]+R_390_TLS_DTPMOD +0
+[0-9a-f ]+R_390_TLS_TPOFF +44
 [0-9a-f ]+R_390_TLS_TPOFF +0+10 sg5 \+ 0
 [0-9a-f ]+R_390_TLS_DTPMOD +0+ sg1 \+ 0
 [0-9a-f ]+R_390_TLS_DTPOFF +0+ sg1 \+ 0
diff --git a/ld/testsuite/ld-sh/shared-1.d b/ld/testsuite/ld-sh/shared-1.d
index 940195d..28034e9 100644
--- a/ld/testsuite/ld-sh/shared-1.d
+++ b/ld/testsuite/ld-sh/shared-1.d
@@ -13,7 +13,7 @@
 
 Relocation section '\.rela\.text' at offset 0x[0-9a-f]+ contains 1 entries:
 .*
-0000019c +[0-9a-f]+ R_SH_RELATIVE +000001a0
+0000019c +[0-9a-f]+ R_SH_RELATIVE +1a0
 
 Hex dump of section '\.rela\.text':
   0x00000188 9c010000 a5000000 a0010000 .*
diff --git a/ld/testsuite/ld-sh/tlspic-2.d b/ld/testsuite/ld-sh/tlspic-2.d
index 4005299..d8e355f 100644
--- a/ld/testsuite/ld-sh/tlspic-2.d
+++ b/ld/testsuite/ld-sh/tlspic-2.d
@@ -50,13 +50,13 @@ Program Headers:
 
 Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 10 entries:
  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
-[0-9a-f ]+R_SH_TLS_DTPMOD32 +0+00
-[0-9a-f ]+R_SH_TLS_TPOFF32 +0+0c
-[0-9a-f ]+R_SH_TLS_DTPMOD32 +0+00
-[0-9a-f ]+R_SH_TLS_DTPMOD32 +0+00
-[0-9a-f ]+R_SH_TLS_TPOFF32 +0+1c
-[0-9a-f ]+R_SH_TLS_DTPMOD32 +0+00
-[0-9a-f ]+R_SH_TLS_TPOFF32 +0+14
+[0-9a-f ]+R_SH_TLS_DTPMOD32 +0
+[0-9a-f ]+R_SH_TLS_TPOFF32 +c
+[0-9a-f ]+R_SH_TLS_DTPMOD32 +0
+[0-9a-f ]+R_SH_TLS_DTPMOD32 +0
+[0-9a-f ]+R_SH_TLS_TPOFF32 +1c
+[0-9a-f ]+R_SH_TLS_DTPMOD32 +0
+[0-9a-f ]+R_SH_TLS_TPOFF32 +14
 [0-9a-f ]+R_SH_TLS_DTPMOD32 +0+ +sg1 \+ 0
 [0-9a-f ]+R_SH_TLS_DTPOFF32 +0+ +sg1 \+ 0
 [0-9a-f ]+R_SH_TLS_TPOFF32 +0+04 +sg2 \+ 0
diff --git a/ld/testsuite/ld-sparc/tlssunnopic32.rd b/ld/testsuite/ld-sparc/tlssunnopic32.rd
index a35652b..f2f26e7 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic32.rd
@@ -38,14 +38,14 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries:
  Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
 [0-9a-f ]+R_SPARC_HI22 +0+12080 +\.got \+ 12080
 [0-9a-f ]+R_SPARC_LO10 +0+12080 +\.got \+ 12080
-[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+9
-[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+9
-[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+1c
-[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+1c
-[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+
-[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+4
-[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+14
-[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+18
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +9
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +9
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +1c
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +1c
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +4
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +14
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +18
 [0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+ +sg1 \+ 0
 [0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+ +sg2 \+ 0
 
diff --git a/ld/testsuite/ld-sparc/tlssunnopic64.rd b/ld/testsuite/ld-sparc/tlssunnopic64.rd
index 3ccea67..9f7ff7b 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic64.rd
@@ -40,14 +40,14 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
 [0-9a-f ]+R_SPARC_LM22 +0+102100 +\.got \+ 102100
 [0-9a-f ]+R_SPARC_HM10 +0+102100 +\.got \+ 102100
 [0-9a-f ]+R_SPARC_LO10 +0+102100 +\.got \+ 102100
-[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+9
-[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+9
-[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+1c
-[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+1c
-[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+
-[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+4
-[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+14
-[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+18
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +9
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +9
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +1c
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +1c
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +4
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +14
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +18
 [0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sg1 \+ 0
 [0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sg2 \+ 0
 
diff --git a/ld/testsuite/ld-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd
index 6ab67e9..e6a793a 100644
--- a/ld/testsuite/ld-sparc/tlssunpic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic32.rd
@@ -40,16 +40,16 @@ Program Headers:
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
  Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
-[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+24
-[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+30
-[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
-[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
-[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+64
-[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+50
-[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+70
-[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
-[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+44
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +24
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +30
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +64
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +50
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +70
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +44
 [0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+10 +sg5 \+ 0
 [0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+ +sg1 \+ 0
 [0-9a-f ]+R_SPARC_TLS_DTPOFF32 +0+ +sg1 \+ 0
diff --git a/ld/testsuite/ld-sparc/tlssunpic64.rd b/ld/testsuite/ld-sparc/tlssunpic64.rd
index 35a7c79..0ba98dd 100644
--- a/ld/testsuite/ld-sparc/tlssunpic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic64.rd
@@ -40,16 +40,16 @@ Program Headers:
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
-[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+24
-[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+30
-[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
-[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
-[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+64
-[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+50
-[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+70
-[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
-[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+44
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +24
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +30
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +64
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +50
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +70
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +44
 [0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+10 +sg5 \+ 0
 [0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+ +sg1 \+ 0
 [0-9a-f ]+R_SPARC_TLS_DTPOFF64 +0+ +sg1 \+ 0