From 7dbe414f2453b79231a1a8ab5ce957a28a04628c Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sat, 12 May 2012 01:12:14 +0000
Subject: [PATCH] Adjust testcases for readelf addend change

	* ld-cris/hiddef1.d: Updated.
	* ld-cris/libdso-2.d: Likewise.
	* ld-cris/tls-js1.d: Likewise.
	* ld-cris/tls-local-63.d: Likewise.
	* ld-cris/tls-local-64.d: Likewise.
---
 ld/testsuite/ChangeLog              | 8 ++++++++
 ld/testsuite/ld-cris/hiddef1.d      | 2 +-
 ld/testsuite/ld-cris/libdso-2.d     | 2 +-
 ld/testsuite/ld-cris/tls-js1.d      | 2 +-
 ld/testsuite/ld-cris/tls-local-63.d | 2 +-
 ld/testsuite/ld-cris/tls-local-64.d | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 63e8f90485a..d7565b097c9 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-cris/hiddef1.d: Updated.
+	* ld-cris/libdso-2.d: Likewise.
+	* ld-cris/tls-js1.d: Likewise.
+	* ld-cris/tls-local-63.d: Likewise.
+	* ld-cris/tls-local-64.d: Likewise.
+
 2012-05-11  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/14088
diff --git a/ld/testsuite/ld-cris/hiddef1.d b/ld/testsuite/ld-cris/hiddef1.d
index b3bd87dfab2..1a1cc186bdb 100644
--- a/ld/testsuite/ld-cris/hiddef1.d
+++ b/ld/testsuite/ld-cris/hiddef1.d
@@ -20,7 +20,7 @@ There are 11 section headers, starting at offset 0x[0-9a-f]+:
 #...
 Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
 #...
-[0-9a-f]+  0+c R_CRIS_RELATIVE                              [0-9a-f]+
+[0-9a-f]+  0+c R_CRIS_RELATIVE +[0-9a-f]+
 #...
 Symbol table '\.dynsym' contains 6 entries:
 #...
diff --git a/ld/testsuite/ld-cris/libdso-2.d b/ld/testsuite/ld-cris/libdso-2.d
index 165e2228e10..d50cceb24d1 100644
--- a/ld/testsuite/ld-cris/libdso-2.d
+++ b/ld/testsuite/ld-cris/libdso-2.d
@@ -27,7 +27,7 @@ There are 13 section headers.*
 #...
 Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
 #...
-00002[12][0-9a-f][048c] +0000000c R_CRIS_RELATIVE +00000150
+00002[12][0-9a-f][048c] +0000000c R_CRIS_RELATIVE +150
 #...
 Symbol table '\.dynsym' contains 4 entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
diff --git a/ld/testsuite/ld-cris/tls-js1.d b/ld/testsuite/ld-cris/tls-js1.d
index 0dc4f7c19a0..0c1509fb705 100644
--- a/ld/testsuite/ld-cris/tls-js1.d
+++ b/ld/testsuite/ld-cris/tls-js1.d
@@ -20,7 +20,7 @@
 #...
 Relocation section '\.rela\.dyn' at offset 0x20c contains 2 entries:
  Offset     Info    Type            Sym\.Value  Sym\. Name \+ Addend
-00002354  0000001e R_CRIS_DTPMOD                                00000000
+00002354  0000001e R_CRIS_DTPMOD +0
 00002364  0000050a R_CRIS_GLOB_DAT   00002368   expobj \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x224 contains 2 entries:
diff --git a/ld/testsuite/ld-cris/tls-local-63.d b/ld/testsuite/ld-cris/tls-local-63.d
index ea86a461b4c..320e717c8ae 100644
--- a/ld/testsuite/ld-cris/tls-local-63.d
+++ b/ld/testsuite/ld-cris/tls-local-63.d
@@ -10,7 +10,7 @@
 #...
 Relocation section '.rela.dyn' at offset 0x.* contains 1 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
-00002210  0000001c R_CRIS_32_TPREL[ ]+00+
+00002210  0000001c R_CRIS_32_TPREL[ ]+0
 
 The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.
 
diff --git a/ld/testsuite/ld-cris/tls-local-64.d b/ld/testsuite/ld-cris/tls-local-64.d
index 7630fdcd2e2..1ed741c15df 100644
--- a/ld/testsuite/ld-cris/tls-local-64.d
+++ b/ld/testsuite/ld-cris/tls-local-64.d
@@ -12,7 +12,7 @@
 #...
 Relocation section '.rela.dyn' at offset 0x.* contains 1 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
-00002290  0000001c R_CRIS_32_TPREL[ ]+0+80
+00002290  0000001c R_CRIS_32_TPREL[ ]+80
 
 The decoding of unwind sections for machine type Axis Communications 32-bit embedded processor is not currently supported.