diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b0f4213ffd1..6a73d11c131 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-09  Richard Sandiford  <rsandifo@redhat.com>
+
+	PR target/11699
+	* config/mips/mips.c (override_options): Reject -mabi=eabi -mabicalls.
+
 2003-08-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* pa.md (extzv, extv, insv): Fix operand limit checks.  Fail if
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 9fe8bbf912c..23628de0ac9 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -5037,6 +5037,13 @@ override_options ()
   if (TARGET_BRANCHLIKELY && !ISA_HAS_BRANCHLIKELY)
     warning ("generation of Branch Likely instructions enabled, but not supported by architecture");
 
+  /* The effect of -mabicalls isn't defined for the EABI.  */
+  if (mips_abi == ABI_EABI && TARGET_ABICALLS)
+    {
+      error ("unsupported combination: %s", "-mabicalls -mabi=eabi");
+      target_flags &= ~MASK_ABICALLS;
+    }
+
   /* -fpic (-KPIC) is the default when TARGET_ABICALLS is defined.  We need
      to set flag_pic so that the LEGITIMATE_PIC_OPERAND_P macro will work.  */
   /* ??? -non_shared turns off pic code generation, but this is not