Add switches to control AIX multlibs

This commit is contained in:
Michael Meissner
1995-12-20 20:17:24 +00:00
parent 5e69b693c9
commit d1265690b1
2 changed files with 97 additions and 190 deletions

View File

@ -1,3 +1,13 @@
Wed Dec 20 15:15:35 1995 Michael Meissner <meissner@tiktok.cygnus.com>
* config-ml.in (rs6000*, powerpc*): Add switches to control which
AIX multilibs get built.
Mon Dec 18 17:55:46 1995 Jason Molenda (crash@phydeaux.cygnus.com)
* configure.in (i386-win32): Don't build expect if we're not
building the tcl subdir.
Mon Dec 18 11:47:19 1995 Stan Shebs <shebs@andros.cygnus.com> Mon Dec 18 11:47:19 1995 Stan Shebs <shebs@andros.cygnus.com>
* Makefile.in: (configure-target-examples, all-target-examples): * Makefile.in: (configure-target-examples, all-target-examples):

View File

@ -163,81 +163,56 @@ fi
# If this is the library's top level directory, set multidirs to the # If this is the library's top level directory, set multidirs to the
# multilib subdirs to support. This lives at the top because we need # multilib subdirs to support. This lives at the top because we need
# `multidirs' set right away, and this section is subject to frequent # `multidirs' set right away.
# editing (addition of new targets, etc.).
if [ "${ml_toplevel_p}" = yes ]; then if [ "${ml_toplevel_p}" = yes ]; then
multidirs=
for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
dir=`echo $i | sed -e 's/;.*$//'`
if [ "${dir}" = "." ]; then
true
else
if [ -z "${multidirs}" ]; then
multidirs="${dir}"
else
multidirs="${multidirs} ${dir}"
fi
fi
done
case "${target}" in case "${target}" in
# start-sanitize-arc # start-sanitize-arc
arc-sbp-elf*) arc-sbp-elf*)
if [ x$enable_biendian = xyes ] if [ x$enable_biendian != xyes ]
then then
multidirs="be host graphics audio be/host be/graphics be/audio" old_multidirs=${multidirs}
else multidirs=
multidirs="host graphics audio" for x in ${old_multidirs}; do
case "${x}" in
*be*) ;;
*) if [ x"$multidirs" = x ]; then
multidirs="$x";
else
multidirs="${multidirs} ${x}";
fi
;;
esac
done
fi fi
;; ;;
arc-*-*)
multidirs="be"
;;
# end-sanitize-arc # end-sanitize-arc
hppa*-*-*)
multidirs="soft-float"
;;
m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-vxworks*)
multidirs="m68000 m68020 m68881 msoft-float m68000/m68881 m68000/msoft-float m68020/m68881 m68020/msoft-float"
;;
i960-*-*)
multidirs=float
;;
sparclite-*-* | sparclitefrw*-*-*)
multidirs="mfpu msoft-float mflat mno-flat mfpu/mflat mfpu/mno-flat msoft-float/mflat msoft-float/mno-flat"
;;
sparc-*-* | sparcfrw*-*-*)
multidirs="soft v8 soft/v8"
;;
z8k-*-coff)
multidirs="z8001 std z8001/std"
;;
h8300-*-*)
multidirs=h8300h
;;
h8500-*-*)
multidirs="mbig msmall mcompact mmedium"
;;
# start-sanitize-jaguar
jaguar-*-*)
multidirs="be"
;;
# end-sanitize-jaguar
sh-*-*)
multidirs="ml m2 ml/m2"
# start-sanitize-sh3e
multidirs="ml m2 ml/m2 m3e ml/m3e"
# end-sanitize-sh3e
;;
mips*-*-*) mips*-*-*)
# Note that not all of these will be built for a particular if [ x$enable_single_float = xno ]
# target; what is build depends upon the output gcc then
# --print-multi-lib. We configure them all, to make our life old_multidirs="${multidirs}"
# simpler here. If somebody cares about configuration multidirs=""
# efficiency, they will need to switch off on the various for x in ${old_multidirs}; do
# targets to configure just the directories needed for that case "$x" in
# target. *single* ) : ;;
# *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
# In the long run, it would be better to configure based on esac
# the output of gcc --print-multi-lib, but, to do that, we done
# would have to build gcc before configuring newlib.
#
# Default to including the single-float directories.
if [ x$enable_single_float = x ]; then
enable_single_float=yes
fi
if [ x$enable_single_float = xyes ]; then
multidirs="soft-float single el eb mips1 mips3 soft-float/el soft-float/eb soft-float/mips1 soft-float/mips3 soft-float/el/mips1 soft-float/el/mips3 soft-float/eb/mips1 soft-float/eb/mips3 single/el single/eb single/mips1 single/mips3 single/el/mips1 single/el/mips3 single/eb/mips1 single/eb/mips3 el/mips1 el/mips3 eb/mips1 eb/mips3"
else
multidirs="soft-float el eb mips1 mips3 soft-float/el soft-float/eb soft-float/mips1 soft-float/mips3 soft-float/el/mips1 soft-float/el/mips3 soft-float/eb/mips1 soft-float/eb/mips3 el/mips1 el/mips3 eb/mips1 eb/mips3"
fi fi
if [ x$enable_biendian = xno ] if [ x$enable_biendian = xno ]
then then
@ -245,7 +220,8 @@ mips*-*-*)
multidirs="" multidirs=""
for x in ${old_multidirs}; do for x in ${old_multidirs}; do
case "$x" in case "$x" in
*endian* ) : ;; *el* ) : ;;
*eb* ) : ;;
*) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;; *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
esac esac
done done
@ -261,31 +237,8 @@ mips*-*-*)
esac esac
done done
fi fi
if [ x$enable_relocatable = 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 ;;
esac
done
fi
if [ x$enable_sysv = xno ]
then
old_multidirs="${multidirs}"
multidirs=""
for x in ${old_multidirs}; do
case "$x" in
*sysv* ) : ;;
*) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
esac
done
fi
;; ;;
powerpc-ibm-aix* | rs6000-ibm-aix*) powerpc*-*-* | rs6000*-*-*)
multidirs="soft-float common soft-float/common"
if [ x$enable_softfloat = xno ] if [ x$enable_softfloat = xno ]
then then
old_multidirs="${multidirs}" old_multidirs="${multidirs}"
@ -308,9 +261,50 @@ powerpc-ibm-aix* | rs6000-ibm-aix*)
esac esac
done done
fi fi
;; if [ x$enable_powercpu = xno ]
powerpc-*-eabiaix*) then
multidirs="soft-float relocatable little sysv little/sysv relocatable/little relocatable/sysv relocatable/little/sysv soft-float/relocatable soft-float/little soft-float/sysv soft-float/little/sysv soft-float/relocatable/little soft-float/relocatable/sysv soft-float/relocatable/little/sysv" 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 ;;
esac
done
fi
if [ x$enable_power2cpu = 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 ;;
esac
done
fi
if [ x$enable_powerpccpu = 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 ;;
esac
done
fi
if [ x$enable_601cpu = 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 ;;
esac
done
fi
if [ x$enable_biendian = xno ] if [ x$enable_biendian = xno ]
then then
old_multidirs="${multidirs}" old_multidirs="${multidirs}"
@ -322,17 +316,6 @@ powerpc-*-eabiaix*)
esac esac
done done
fi fi
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_relocatable = xno ] if [ x$enable_relocatable = xno ]
then then
old_multidirs="${multidirs}" old_multidirs="${multidirs}"
@ -355,42 +338,6 @@ powerpc-*-eabiaix*)
esac esac
done done
fi fi
;;
powerpc-*-eabi* | powerpc-*-elf* | powerpc-*-sysv4*)
multidirs="soft-float relocatable little aix little/aix relocatable/little relocatable/aix relocatable/little/aix soft-float/relocatable soft-float/little soft-float/aix soft-float/little/aix soft-float/relocatable/little soft-float/relocatable/aix soft-float/relocatable/little/aix aixdesc soft-float/aixdesc"
if [ x$enable_biendian = 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 ;;
esac
done
fi
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_relocatable = 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 ;;
esac
done
fi
if [ x$enable_aix = xno ] if [ x$enable_aix = xno ]
then then
old_multidirs="${multidirs}" old_multidirs="${multidirs}"
@ -403,56 +350,6 @@ powerpc-*-eabi* | powerpc-*-elf* | powerpc-*-sysv4*)
done done
fi fi
;; ;;
powerpcle-*-eabi* | powerpcle-*-elf* | powerpcle-*-sysv4*)
multidirs="soft-float relocatable big aix big/aix relocatable/big relocatable/aix relocatable/big/aix soft-float/relocatable soft-float/big soft-float/aix soft-float/big/aix soft-float/relocatable/big soft-float/relocatable/aix soft-float/relocatable/big/aix"
if [ x$enable_biendian = 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 ;;
esac
done
fi
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_relocatable = 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 ;;
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
;;
*)
multidirs=
;;
esac esac
# Add code to library's top level makefile to handle building the multilib # Add code to library's top level makefile to handle building the multilib
@ -499,7 +396,7 @@ multi-clean:
if [ -z "$(MULTIDIRS)" ]; then \ if [ -z "$(MULTIDIRS)" ]; then \
true; \ true; \
else \ else \
lib=`pwd | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \ lib=`pwd | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
for dir in Makefile $(MULTIDIRS); do \ for dir in Makefile $(MULTIDIRS); do \
if [ -f ../$${dir}/$${lib}/Makefile ]; then \ if [ -f ../$${dir}/$${lib}/Makefile ]; then \
if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \ if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \