diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ee5955e1a3cb..4ceac4cb6640 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-11  Richard Henderson  <rth@redhat.com>
+
+	* config/linux.h (CPLUSPLUS_CPP_SPEC): Use %(cpp) not $(cpp_cpu).
+	* config/alpha/linux.h (CPLUSPLUS_CPP_SPEC): Likewise.
+
 2001-06-11  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
 	* config/rs6000/linux.h (CPLUSPLUS_CPP_SPEC): New.
diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h
index fb33b44d34a6..e2a6e6004d7b 100644
--- a/gcc/config/alpha/linux.h
+++ b/gcc/config/alpha/linux.h
@@ -30,7 +30,7 @@ SUB_CPP_PREDEFINES
 
 /* The GNU C++ standard library requires that these macros be defined.  */
 #undef CPLUSPLUS_CPP_SPEC
-#define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp_cpu)"
+#define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
 
 #undef LIB_SPEC
 #define LIB_SPEC \
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
index 62186ef79b2f..dc1a4c72113d 100644
--- a/gcc/config/linux.h
+++ b/gcc/config/linux.h
@@ -75,12 +75,9 @@ Boston, MA 02111-1307, USA.  */
 #define CC1_SPEC "%{profile:-p}"
 #endif
 
-/* The GNU C++ standard library requires that these macros be
-   defined.  */
+/* The GNU C++ standard library requires that these macros be defined.  */
 #undef CPLUSPLUS_CPP_SPEC
-#define CPLUSPLUS_CPP_SPEC                      \
-  "-D_GNU_SOURCE                                \
-   %(cpp_cpu)"
+#define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
 
 #ifndef USE_GNULIBC_1
 #undef DEFAULT_VTABLE_THUNKS