diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 283c3430c4e..96e683cf65f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-27  Richard Sandiford  <richard@codesourcery.com>
+
+	* doc/invoke.texi (mdsp, mdspr2): Document the __mips_dsp,
+	__mips_dspr2 and __mips_dsp_rev macros.
+	* config/mips/mips.h (TARGET_CPU_CPP_BUILTINS): Define __mips_dsp_rev.
+
 2007-07-27  Douglas Gregor  <doug.gregor@gmail.com>
 	
        * c-common.h (enum rid): Add RID_DECLTYPE, update RID_LAST_CXX0X.
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 2496986c881..17a7376f747 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -378,10 +378,16 @@ extern const struct mips_rtx_cost_data *mips_cost;
 	builtin_define ("__mips_smartmips");			\
 								\
       if (TARGET_DSP)						\
-	builtin_define ("__mips_dsp");				\
-								\
-      if (TARGET_DSPR2)						\
-	builtin_define ("__mips_dspr2");			\
+	{							\
+	  builtin_define ("__mips_dsp");			\
+	  if (TARGET_DSPR2)					\
+	    {							\
+	      builtin_define ("__mips_dspr2");			\
+	      builtin_define ("__mips_dsp_rev=2");		\
+	    }							\
+	  else							\
+	    builtin_define ("__mips_dsp_rev=1");		\
+	}							\
 								\
       MIPS_CPP_SET_PROCESSOR ("_MIPS_ARCH", mips_arch_info);	\
       MIPS_CPP_SET_PROCESSOR ("_MIPS_TUNE", mips_tune_info);	\
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 116513ea031..20c0d40ceb8 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -11658,14 +11658,19 @@ operations.  This is the default.
 @itemx -mno-dsp
 @opindex mdsp
 @opindex mno-dsp
-Use (do not use) the MIPS DSP ASE.  @xref{MIPS DSP Built-in Functions}.
+Use (do not use) revision 1 of the MIPS DSP ASE.
+@xref{MIPS DSP Built-in Functions}.  This option defines the
+preprocessor macro @samp{__mips_dsp}.  It also defines
+@samp{__mips_dsp_rev} to 1.
 
 @item -mdspr2
 @itemx -mno-dspr2
 @opindex mdspr2
 @opindex mno-dspr2
-Use (do not use) the MIPS DSP ASE REV 2.  @xref{MIPS DSP Built-in Functions}.
-The option @option{-mdspr2} implies @option{-mdsp}.
+Use (do not use) revision 2 of the MIPS DSP ASE.
+@xref{MIPS DSP Built-in Functions}.  This option defines the
+preprocessor macros @samp{__mips_dsp} and @samp{__mips_dspr2}.
+It also defines @samp{__mips_dsp_rev} to 2.
 
 @item -msmartmips
 @itemx -mno-smartmips