diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f159c44c9ef..9aa551aebb7 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-20  Matthias Klose  <doko@debian.org>
+
+	* configure.host: Set try_cpu to target_cpu for existing
+	baseline files.
+
 2003-06-19  Andreas Jaeger  <aj@suse.de>
 
 	* testsuite/Makefile.am (extract_symvers): Revert accidental
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index aaaf932ecb2..8348b347d60 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -58,9 +58,6 @@ c_compatibility=no
 # Set any CPU-dependent bits.
 # Here we override defaults and catch more general cases due to naming
 # conventions (e.g., chip_name* to catch all variants).
-if test -d ${glibcpp_srcdir}/config/cpu/${host_cpu}; then
-  try_cpu=${host_cpu}
-fi
 
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 case "${host_cpu}" in
@@ -93,7 +90,11 @@ case "${host_cpu}" in
     try_cpu=sparc
     ;;
   *)
-    try_cpu=generic
+    if test -d ${glibcpp_srcdir}/config/cpu/${host_cpu}; then
+      try_cpu=${host_cpu}
+    else
+      try_cpu=generic
+    fi
     ;;
 esac