From ea2785a34a9e28e8849f61e70c03bd7d749f604f Mon Sep 17 00:00:00 2001
From: Michael Meissner <gnu@the-meissners.org>
Date: Fri, 6 Oct 1995 18:42:50 +0000
Subject: [PATCH] Add AIX multilib support; Add -mcall-aix/-mcall-aixdesc
 multilibs to powerpc*-*-eabisim.

---
 ChangeLog     |  7 +++++++
 cfg-ml-com.in | 40 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e97dd18810..f73218f16a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Oct  6 14:40:28 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* cfg-ml-com.in ({powerpc,rs6000}-ibm-aix*): Add multilibs for
+	-msoft-float and -mcpu=common support.
+	(powerpc*-*-eabisim*): Add support for building -mcall-aix and
+	-mcall-aixdesc libraries.
+
 Thu Oct  5 13:26:37 1995  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
 	* configure.in: Allow configuration and build of emacs19 for the alpha.
diff --git a/cfg-ml-com.in b/cfg-ml-com.in
index c683d9a534..f1fceada3f 100644
--- a/cfg-ml-com.in
+++ b/cfg-ml-com.in
@@ -181,6 +181,31 @@ mips*-*-*)
 	  done
 	fi
 	;;
+powerpc-ibm-aix* | rs6000-ibm-aix*)
+	multidirs="soft-float common soft-float/common"
+	if [ x$enable_softfloat = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *soft-float* ) : ;;
+	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_commoncpu = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *common* ) : ;;
+	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	    esac
+	  done
+	fi
+	;;
 powerpc-*-eabiaix*)
 	multidirs="soft-float relocatable little-endian call-sysv little-endian/call-sysv relocatable/little-endian relocatable/call-sysv relocatable/little-endian/call-sysv soft-float/relocatable soft-float/little-endian soft-float/call-sysv soft-float/little-endian/call-sysv soft-float/relocatable/little-endian soft-float/relocatable/call-sysv soft-float/relocatable/little-endian/call-sysv"
 	if [ x$enable_biendian = xno ]
@@ -228,8 +253,8 @@ powerpc-*-eabiaix*)
 	  done
 	fi
 	;;
-powerpc*-*-eabisim*)
-	multidirs="little-endian big-endian mrelocatable little-endian/mrelocatable big-endian/mrelocatable"
+powerpc*-*-eabisim*)	# don't both with {aix,aixdesc}/mrelocatable configurations
+	multidirs="little-endian big-endian aix aixdesc mrelocatable little-endian/mrelocatable big-endian/mrelocatable"
 	if [ x$enable_biendian = xno ]
 	then
 	  old_multidirs="${multidirs}"
@@ -241,6 +266,17 @@ powerpc*-*-eabisim*)
 	    esac
 	  done
 	fi
+	if [ x$enable_aix = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *aix* ) : ;;
+	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	    esac
+	  done
+	fi
 	if [ x$enable_relocatable = xno ]
 	then
 	  old_multidirs="${multidirs}"
-- 
2.34.1