From 3130a391193cf83f61785181cf8f133f2d407b2e Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 16 Dec 1997 00:14:49 +0000
Subject: [PATCH] Add m32r to multilib support.

---
 ChangeLog    |   4 ++
 config-ml.in | 125 +++++++++++++++++++++++++++++++++++------------------------
 2 files changed, 78 insertions(+), 51 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65dce389..25b39cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 15 16:12:28 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* config-ml.in (multidirs): Add m32r to multilib list.
+
 Fri Dec 12 10:43:31 1997  Brendan Kehoe  <brendan@canuck.cygnus.com>
 
 	* Makefile.in (all-target-gperf): Change dependency to
diff --git a/config-ml.in b/config-ml.in
index 03f20ae..e5567a9 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -201,148 +201,167 @@ for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
 done
 
 case "${target}" in
-# start-sanitize-arc
-arc-sbp-elf*)
+arc-*-elf*)
 	if [ x$enable_biendian != xyes ]
 	then
 	  old_multidirs=${multidirs}
-	  multidirs=
+	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "${x}" in
-	      *be*) ;;
-	      *) if [ x"$multidirs" = x ]; then
-		   multidirs="$x";
-		 else
-		   multidirs="${multidirs} ${x}"; 
-		 fi
-		 ;;
+	      *be*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
 	;;
-# end-sanitize-arc
-mips*-*-*)
-	if [ x$enable_single_float = xno ]
+m32r-*-*)
+	if [ x$enable_m32rx = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *m32rx*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	;;
+m68*-*-*)
+	if [ x$enable_softfloat = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *single* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *soft-float* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_biendian = xno ]
+	if [ x$enable_m68881 = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *el* ) : ;;
-	      *eb* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *m68881* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_softfloat = xno ]
+	if [ x$enable_m68000 = 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 ;;
+	      *m68000* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_m68020 = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *m68020* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
 	;;
-powerpc*-*-* | rs6000*-*-*)
-	if [ x$enable_softfloat = xno ]
+mips*-*-*)
+	if [ x$enable_single_float = 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 ;;
+	      *single* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_commoncpu = xno ]
+	if [ x$enable_biendian = 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 ;;
+	      *el* ) : ;;
+	      *eb* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_powercpu = xno ]
+	if [ x$enable_softfloat = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      power | */power | */power/* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *soft-float* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_power2cpu = xno ]
+	;;
+powerpc*-*-* | rs6000*-*-*)
+	if [ x$enable_softfloat = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *power2* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *soft-float* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_powerpccpu = xno ]
+	if [ x$enable_powercpu = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *powerpc* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      power | */power | */power/* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_601cpu = xno ]
+	if [ x$enable_powerpccpu = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *601* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *powerpc* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_biendian = xno ]
+	if [ x$enable_powerpcos = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *endian* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *mcall-linux* | *mcall-solaris* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_relocatable = xno ]
+	if [ x$enable_biendian = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *relocatable* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *mlittle* | *mbig* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
@@ -352,8 +371,8 @@ powerpc*-*-* | rs6000*-*-*)
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *sysv* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *mcall-sysv* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
@@ -363,14 +382,18 @@ powerpc*-*-* | rs6000*-*-*)
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *aix* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *mcall-aix* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
 	;;
 esac
 
+# Remove extraneous blanks from multidirs.
+# Tests like `if [ -n "$multidirs" ]' require it.
+multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ][ ]*/ /g'`
+
 # Add code to library's top level makefile to handle building the multilib
 # subdirs.
 
-- 
2.7.4