diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 17fe6e6e6f3..89ca22a910a 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 07d8ba4b5e3..5c259f101f3 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 74ec7cbc478..b36743562fa 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 d87c45c076d..228601caa58 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;