From ddfd679590d5e2555cc7a5d80696d82b1839016a Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Fri, 26 Mar 2010 08:34:24 +0000
Subject: [PATCH] * elf32-ppc.c (ppc_elf_howto_raw <R_PPC_EMB_RELSDA>):
Not pc-relative. * bfd-in.h (elf_discarded_section): Clarify comment.
* reloc.c (struct reloc_howto_struct <pc_relative>): Likewise. *
bfd-in2.h: Regenerate.
---
bfd/ChangeLog | 7 +++++++
bfd/bfd-in.h | 2 +-
bfd/bfd-in2.h | 7 ++-----
bfd/elf32-ppc.c | 2 +-
bfd/reloc.c | 5 +----
5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4aba050bf66..97bf5a4a65b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-26 Alan Modra <amodra@gmail.com>
+
+ * elf32-ppc.c (ppc_elf_howto_raw <R_PPC_EMB_RELSDA>): Not pc-relative.
+ * bfd-in.h (elf_discarded_section): Clarify comment.
+ * reloc.c (struct reloc_howto_struct <pc_relative>): Likewise.
+ * bfd-in2.h: Regenerate.
+
2010-03-26 Matt Rice <ratmice@gmail.com>
* archive.c (_bfd_compute_and_write_armap): Allow symbols flagged
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index c775a0b5ee1..07f2fae849e 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -294,7 +294,7 @@ typedef struct bfd_section *sec_ptr;
(((sec)->rawsize ? (sec)->rawsize : (sec)->size) \
/ bfd_octets_per_byte (bfd))
-/* Return TRUE if section has been discarded. */
+/* Return TRUE if input section SEC has been discarded. */
#define elf_discarded_section(sec) \
(!bfd_is_abs_section (sec) \
&& bfd_is_abs_section ((sec)->output_section) \
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 7be93ff1146..abf4c177d08 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -301,7 +301,7 @@ typedef struct bfd_section *sec_ptr;
(((sec)->rawsize ? (sec)->rawsize : (sec)->size) \
/ bfd_octets_per_byte (bfd))
-/* Return TRUE if section has been discarded. */
+/* Return TRUE if input section SEC has been discarded. */
#define elf_discarded_section(sec) \
(!bfd_is_abs_section (sec) \
&& bfd_is_abs_section ((sec)->output_section) \
@@ -2244,10 +2244,7 @@ struct reloc_howto_struct
when doing overflow checking. */
unsigned int bitsize;
- /* Notes that the relocation is relative to the location in the
- data section of the addend. The relocation function will
- subtract from the relocation value the address of the location
- being relocated. */
+ /* The relocation is relative to the field being relocated. */
bfd_boolean pc_relative;
/* The bit position of the reloc value in the destination.
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 6e4cbc1238e..2c42464ee9d 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -1380,7 +1380,7 @@ static reloc_howto_type ppc_elf_howto_raw[] = {
0, /* rightshift */
1, /* size (0 = byte, 1 = short, 2 = long) */
16, /* bitsize */
- TRUE, /* pc_relative */
+ FALSE, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
bfd_elf_generic_reloc, /* special_function */
diff --git a/bfd/reloc.c b/bfd/reloc.c
index ae8f0b35705..a8476295d23 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -305,10 +305,7 @@ CODE_FRAGMENT
. when doing overflow checking. *}
. unsigned int bitsize;
.
-. {* Notes that the relocation is relative to the location in the
-. data section of the addend. The relocation function will
-. subtract from the relocation value the address of the location
-. being relocated. *}
+. {* The relocation is relative to the field being relocated. *}
. bfd_boolean pc_relative;
.
. {* The bit position of the reloc value in the destination.