aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2005-02-11 22:29:10 +0000
committerMaciej W. Rozycki <macro@linux-mips.org>2005-02-11 22:29:10 +0000
commit254f0426b522d3abc060f9eee02484dab96fb699 (patch)
tree18e7cf53350077ce54944bf8f7d2578ced5f135a
parent01b9137461f11882a03589e8c40fd718b0c09a09 (diff)
downloadgdb-254f0426b522d3abc060f9eee02484dab96fb699.zip
gdb-254f0426b522d3abc060f9eee02484dab96fb699.tar.gz
gdb-254f0426b522d3abc060f9eee02484dab96fb699.tar.bz2
* elf32-mips.c (_bfd_mips_elf32_gprel16_reloc): Reject
R_MIPS_LITERAL relocations for external symbols. * elf64-mips.c (mips_elf64_literal_reloc): Likewise. * elfn32-mips.c (mips_elf_literal_reloc): Likewise.
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/elf32-mips.c11
-rw-r--r--bfd/elf64-mips.c8
-rw-r--r--bfd/elfn32-mips.c10
4 files changed, 32 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 17fe6e6..89ca22a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-11 Maciej W. Rozycki <macro@mips.com>
+
+ * elf32-mips.c (_bfd_mips_elf32_gprel16_reloc): Reject
+ R_MIPS_LITERAL relocations for external symbols.
+ * elf64-mips.c (mips_elf64_literal_reloc): Likewise.
+ * elfn32-mips.c (mips_elf_literal_reloc): Likewise.
+
2005-02-11 H.J. Lu <hongjiu.lu@intel.com>
* bfd-in2.h: Rebuilt.
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 07d8ba4..5c259f1 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -770,6 +770,17 @@ _bfd_mips_elf32_gprel16_reloc (bfd *abfd, arelent *reloc_entry,
bfd_reloc_status_type ret;
bfd_vma gp;
+ /* R_MIPS_LITERAL relocations are defined for local symbols only. */
+ if (reloc_entry->howto->type == R_MIPS_LITERAL
+ && output_bfd != NULL
+ && (symbol->flags & BSF_SECTION_SYM) == 0
+ && (symbol->flags & BSF_LOCAL) != 0)
+ {
+ *error_message = (char *)
+ _("literal relocation occurs for an external symbol");
+ return bfd_reloc_outofrange;
+ }
+
if (output_bfd != NULL)
relocatable = TRUE;
else
diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index 74ec7cb..b367435 100644
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -1543,14 +1543,14 @@ mips_elf64_literal_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
bfd_reloc_status_type ret;
bfd_vma gp;
- /* If we're relocating, and this is an external symbol, we don't
- want to change anything. */
+ /* R_MIPS_LITERAL relocations are defined for local symbols only. */
if (output_bfd != NULL
&& (symbol->flags & BSF_SECTION_SYM) == 0
&& (symbol->flags & BSF_LOCAL) != 0)
{
- reloc_entry->address += input_section->output_offset;
- return bfd_reloc_ok;
+ *error_message = (char *)
+ _("literal relocation occurs for an external symbol");
+ return bfd_reloc_outofrange;
}
/* FIXME: The entries in the .lit8 and .lit4 sections should be merged. */
diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
index d87c45c..228601c 100644
--- a/bfd/elfn32-mips.c
+++ b/bfd/elfn32-mips.c
@@ -1348,6 +1348,16 @@ mips_elf_literal_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
bfd_reloc_status_type ret;
bfd_vma gp;
+ /* R_MIPS_LITERAL relocations are defined for local symbols only. */
+ if (output_bfd != NULL
+ && (symbol->flags & BSF_SECTION_SYM) == 0
+ && (symbol->flags & BSF_LOCAL) != 0)
+ {
+ *error_message = (char *)
+ _("literal relocation occurs for an external symbol");
+ return bfd_reloc_outofrange;
+ }
+
/* FIXME: The entries in the .lit8 and .lit4 sections should be merged. */
if (output_bfd != NULL)
relocatable = TRUE;