config-ml.in (powerpc-*-* | rs6000-*-*): Allow aix64 and pthread multilibs to be...

        * config-ml.in (powerpc-*-* | rs6000-*-*): Allow aix64 and pthread
        multilibs to be disabled.

From-SVN: r43294

diff --git a/ChangeLog b/ChangeLog
index 8ab33d9a5b86e0f231dddfb26809733e33c790c1..bd2db16a84668819e0905b95435e75a4661605e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-12  David Edelsohn  <edelsohn@gnu.org>
+
+       * config-ml.in (powerpc-*-* | rs6000-*-*): Allow aix64 and pthread
+       multilibs to be disabled.
+
 2001-06-11  Daniel Berlin  <dan@cgsoftware.com>
 
        * MAINTAINERS (Write After Approval): Add myself.

diff --git a/config-ml.in b/config-ml.in
index 8c879184384ebcfc8eb0b3c95a09be8eb10cda72..16885f95f0e16a95118128171123c15f93257048 100644 (file)
--- a/config-ml.in
+++ b/config-ml.in
@@ -392,6 +392,28 @@ mips*-*-*)
        esac
        ;;
 powerpc*-*-* | rs6000*-*-*)
+       if [ x$enable_aix64 = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *ppc64* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_pthread = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *pthread* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
        if [ x$enable_softfloat = xno ]
        then
          old_multidirs="${multidirs}"