diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2627e774daa..b5675cb9e25 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-19  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs): On VxWorks,
+	exclude __GOTT_BASE__ and __GOTT_INDEX__ from the warning
+	about HI/LO relocations in shared objects.
+
 2010-09-16  Alan Modra  <amodra@gmail.com>
 
 	* elf32-spu.c (spu_elf_size_sections): Omit fixups for non-alloc
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 78f96c19e46..a0694e3bccd 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -7930,6 +7930,10 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 		  && strcmp (h->root.root.string, "_gp_disp") == 0)
 		break;
 
+	      /* Likewise __GOTT_BASE__ and __GOTT_INDEX__ on VxWorks.  */
+	      if (is_gott_symbol (info, h))
+		break;
+
 	      /* FALLTHROUGH */
 
 	    case R_MIPS16_26: