diff --git a/ChangeLog b/ChangeLog
index 68558a767167a1752937a8ecbaa9ebaa8bfb8bc6..145606f8c487daed207d13741253079571f23fef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltcf-c.sh (ld_shlibs) [aix5*]: Disable on unknown CPU types.
+	* ltcf-cxx.sh, ltcf-gcj.sh: Likewise.
+
 2001-01-26  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
 
 	* ltcf-cxx.sh: Use parentheses around eval $ac_compile.
diff --git a/ltcf-c.sh b/ltcf-c.sh
index f00055f2ce82c4a57aec85fe2541c680a66ad952..80bf5ae18c031c90cd7b5f6c1731271e8c2943f8 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -2,7 +2,7 @@
 
 # ltcf-c.sh - Create a C compiler specific configuration
 #
-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
+# Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This file is free software; you can redistribute it and/or modify it
@@ -283,6 +283,12 @@ else
     # Exported symbols can be pulled into shared objects from archives
     whole_archive_flag_spec=' '
     build_libtool_need_lc=yes
+
+    # We don't want to build shared libraries on unknown CPU types.
+    case $host_cpu in
+    powerpc | rs6000) ;;
+    *) ld_shlibs=no ;;
+    esac
     ;;
 
   amigaos*)
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index fad6a4ae5523a5210e7d041570c04d5038fdb7b6..3469e37875b2c6f02ef06e9cff4030710b78e416 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -2,7 +2,7 @@
 
 # ltcf-cxx.sh - Create a C++ compiler specific configuration
 #
-# Copyright (C) 1996-1999,2000 Free Software Foundation, Inc.
+# Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # Original C++ support by:Gary V. Vaughan <gvv@techie.com>
@@ -141,6 +141,12 @@ case "$host_os" in
     # Exported symbols can be pulled into shared objects from archives
     whole_archive_flag_spec=' '
     build_libtool_need_lc=yes
+
+    # We don't want to build shared libraries on unknown CPU types.
+    case $host_cpu in
+    powerpc | rs6000) ;;
+    *) ld_shlibs=no ;;
+    esac
     ;;
   chorus*)
     case "$cc_basename" in
diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh
index 89a286ebf0e989d5c66b1e473f931bafcf45e49a..fe96fe704d9d54f40f7456db8f945ddf0d4849f8 100644
--- a/ltcf-gcj.sh
+++ b/ltcf-gcj.sh
@@ -286,6 +286,12 @@ else
       # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
       always_export_symbols=yes ;;
     esac
+
+    # We don't want to build shared libraries on unknown CPU types.
+    case $host_cpu in
+    powerpc | rs6000) ;;
+    *) ld_shlibs=no ;;
+    esac
    ;;
 
   amigaos*)