From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Sat, 14 Mar 2009 09:15:34 +0000 (+0000)
Subject: bfd/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e3212adedf457b6f7b877b18667190cc79f0848;p=binutils-gdb.git

bfd/
	* xcofflink.c (xcoff_mark, xcoff_link_input_bfd): Don't copy
	R_POS and R_NEG relocations against absolute symbols to the
	.loader section.

ld/testsuite/
	* ld-powerpc/aix-abs-reloc-1.ex, ld-powerpc/aix-abs-reloc-1.im,
	ld-powerpc/aix-abs-reloc-1.od, ld-powerpc/aix-abs-reloc-1.s: New test.
	* ld-powerpc/aix52.exp: Run it.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 51544cc6c9f..9182ef27e3d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (xcoff_mark, xcoff_link_input_bfd): Don't copy
+	R_POS and R_NEG relocations against absolute symbols to the
+	.loader section.
+
 2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
 
 	* coff64-rs6000.c (xcoff64_write_object_contents): Set the cputype
diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
index 21d9a2d9446..0a38ac343c9 100644
--- a/bfd/xcofflink.c
+++ b/bfd/xcofflink.c
@@ -2335,6 +2335,11 @@ xcoff_mark (struct bfd_link_info *info, asection *sec)
 		case R_NEG:
 		case R_RL:
 		case R_RLA:
+		  if (h != NULL
+		      && (h->root.type == bfd_link_hash_defined
+			  || h->root.type == bfd_link_hash_defweak)
+		      && bfd_is_abs_section (h->root.u.def.section))
+		    break;
 		  ++xcoff_hash_table (info)->ldrel_count;
 		  if (h != NULL)
 		    h->flags |= XCOFF_LDREL;
@@ -4460,6 +4465,11 @@ xcoff_link_input_bfd (struct xcoff_final_link_info *finfo,
 		case R_NEG:
 		case R_RL:
 		case R_RLA:
+		  if (h != NULL
+		      && (h->root.type == bfd_link_hash_defined
+			  || h->root.type == bfd_link_hash_defweak)
+		      && bfd_is_abs_section (h->root.u.def.section))
+		    break;
 		  /* This reloc needs to be copied into the .loader
 		     section.  */
 		  ldrel.l_vaddr = irel->r_vaddr;
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index a8baba16943..b02892bf636 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* ld-powerpc/aix-abs-reloc-1.ex, ld-powerpc/aix-abs-reloc-1.im,
+	ld-powerpc/aix-abs-reloc-1.od, ld-powerpc/aix-abs-reloc-1.s: New test.
+	* ld-powerpc/aix52.exp: Run it.
+
 2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
 
 	* ld-powerpc/aix-core-sec-1.s, ld-powerpc/aix-core-sec-1.ex,
diff --git a/ld/testsuite/ld-powerpc/aix-abs-reloc-1.ex b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.ex
new file mode 100644
index 00000000000..257cc5642cb
--- /dev/null
+++ b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.ex
@@ -0,0 +1 @@
+foo
diff --git a/ld/testsuite/ld-powerpc/aix-abs-reloc-1.im b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.im
new file mode 100644
index 00000000000..66f78a490d1
--- /dev/null
+++ b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.im
@@ -0,0 +1 @@
+bar	0xdeadbeef
diff --git a/ld/testsuite/ld-powerpc/aix-abs-reloc-1.od b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.od
new file mode 100644
index 00000000000..db65b4b132e
--- /dev/null
+++ b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.od
@@ -0,0 +1,7 @@
+
+.*
+
+DYNAMIC RELOCATION RECORDS \(none\)
+
+Contents of section \.data:
+ 10000000 deadbeef .*
diff --git a/ld/testsuite/ld-powerpc/aix-abs-reloc-1.s b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.s
new file mode 100644
index 00000000000..5eb39808ac6
--- /dev/null
+++ b/ld/testsuite/ld-powerpc/aix-abs-reloc-1.s
@@ -0,0 +1,4 @@
+	.globl	foo
+	.csect	foo[RW]
+foo:
+	.long	bar
diff --git a/ld/testsuite/ld-powerpc/aix52.exp b/ld/testsuite/ld-powerpc/aix52.exp
index 09725573ca2..1263796b720 100644
--- a/ld/testsuite/ld-powerpc/aix52.exp
+++ b/ld/testsuite/ld-powerpc/aix52.exp
@@ -65,6 +65,12 @@ proc run_aix_test { size name ldopts asopts sources tools output } {
 }
 
 set aix52tests {
+    {"Relocations against absolute symbols 1"
+     "-shared -bI:aix-abs-reloc-1.im -bE:aix-abs-reloc-1.ex"
+     {} {aix-abs-reloc-1.s}
+     {{objdump -sRj.data aix-abs-reloc-1.od}}
+     "aix-abs-reloc-1.so"}
+
     {"Core sections test 1" "-shared -bE:aix-core-sec-1.ex"
      "" {aix-core-sec-1.s}
      {{objdump -h aix-core-sec-1.hd}}