aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2000-04-21 17:25:29 +0000
committerRichard Henderson <rth@redhat.com>2000-04-21 17:25:29 +0000
commitb51a13381712ad0f4192fd54edce35931867bffa (patch)
tree4ff7cffa7f3610c022ff771ddb75a50a4d5bfd94
parent66156876b78f9f1e896fcac94e8bcde08920f99a (diff)
downloadgdb-b51a13381712ad0f4192fd54edce35931867bffa.zip
gdb-b51a13381712ad0f4192fd54edce35931867bffa.tar.gz
gdb-b51a13381712ad0f4192fd54edce35931867bffa.tar.bz2
* elf32-d30v.c (bfd_elf_d30v_reloc): Don't modify section
contents when performing a partial link. (bfd_elf_d30v_reloc_21): Likewise.
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-d30v.c53
2 files changed, 24 insertions, 35 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9c1c319..458fbfa 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-21 Richard Henderson <rth@cygnus.com>
+
+ * elf32-d30v.c (bfd_elf_d30v_reloc): Don't modify section
+ contents when performing a partial link.
+ (bfd_elf_d30v_reloc_21): Likewise.
+
2000-04-20 H.J. Lu <hjl@gnu.org>
* elf32-i386.c (elf_i386_relocate_section): Restrict 1998-12-10
diff --git a/bfd/elf32-d30v.c b/bfd/elf32-d30v.c
index 601fb95..52bafb9 100644
--- a/bfd/elf32-d30v.c
+++ b/bfd/elf32-d30v.c
@@ -287,6 +287,13 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
reloc_howto_type *howto = reloc_entry->howto;
int make_absolute = 0;
+ if (output_bfd != (bfd *) NULL)
+ {
+ /* Partial linking -- do nothing. */
+ reloc_entry->address += input_section->output_offset;
+ return bfd_reloc_ok;
+ }
+
r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
input_section, output_bfd, error_message);
if (r != bfd_reloc_continue)
@@ -314,11 +321,7 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
reloc_target_output_section = symbol->section->output_section;
/* Convert input-section-relative symbol value to absolute. */
- if (output_bfd)
- output_base = 0;
- else
- output_base = reloc_target_output_section->vma;
-
+ output_base = reloc_target_output_section->vma;
relocation += output_base + symbol->section->output_offset;
/* Add in supplied addend. */
@@ -334,18 +337,6 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
relocation -= tmp_addr;
}
- if (output_bfd != (bfd *) NULL)
- {
- /* This is a partial relocation, and we want to apply the relocation
- to the reloc entry rather than the raw data. Modify the reloc
- inplace to reflect what we now know. */
- reloc_entry->addend = relocation;
- reloc_entry->address += input_section->output_offset;
- return flag;
- }
- else
- reloc_entry->addend = 0;
-
in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
in2 = bfd_get_32 (abfd, (bfd_byte *) data + addr + 4);
@@ -406,6 +397,13 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf
reloc_howto_type *howto = reloc_entry->howto;
int mask, max;
+ if (output_bfd != (bfd *) NULL)
+ {
+ /* Partial linking -- do nothing. */
+ reloc_entry->address += input_section->output_offset;
+ return bfd_reloc_ok;
+ }
+
r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
input_section, output_bfd, error_message);
if (r != bfd_reloc_continue)
@@ -433,11 +431,7 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf
reloc_target_output_section = symbol->section->output_section;
/* Convert input-section-relative symbol value to absolute. */
- if (output_bfd)
- output_base = 0;
- else
- output_base = reloc_target_output_section->vma;
-
+ output_base = reloc_target_output_section->vma;
relocation += output_base + symbol->section->output_offset;
/* Add in supplied addend. */
@@ -448,23 +442,12 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf
if (howto->pc_relative == true)
{
- relocation -= input_section->output_section->vma + input_section->output_offset;
+ relocation -= (input_section->output_section->vma
+ + input_section->output_offset);
if (howto->pcrel_offset == true)
relocation -= reloc_entry->address;
}
- if (output_bfd != (bfd *) NULL)
- {
- /* This is a partial relocation, and we want to apply the relocation
- to the reloc entry rather than the raw data. Modify the reloc
- inplace to reflect what we now know. */
- reloc_entry->addend = relocation;
- reloc_entry->address += input_section->output_offset;
- return flag;
- }
- else
- reloc_entry->addend = 0;
-
in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
mask = (1 << howto->bitsize) - 1;