Commit e2de3a46 by H.J. Lu Committed by Jeff Law

configure.in (host_makefile_frag, [...]): Handle multiple config files.

d
        * configure.in (host_makefile_frag, target_makefile_frag):
        Handle multiple config files.
        (alpha-*-linux*): Treat alpha-*-linux* as alpha-*-linux* and
        alpha-*-*.

From-SVN: r17170
parent aca823c1
...@@ -107,42 +107,114 @@ appdirs="" ...@@ -107,42 +107,114 @@ appdirs=""
# Work in distributions that contain no compiler tools, like Autoconf. # Work in distributions that contain no compiler tools, like Autoconf.
if [ -d ${srcdir}/config ]; then if [ -d ${srcdir}/config ]; then
case "${host}" in case "${host}" in
m68k-hp-hpux*) host_makefile_frag=config/mh-hp300 ;; m68k-hp-hpux*)
m68k-apollo-sysv*) host_makefile_frag=config/mh-apollo68 ;; host_makefile_frag="${host_makefile_frag} config/mh-hp300"
m68k-apollo-bsd*) host_makefile_frag=config/mh-a68bsd ;; ;;
m88k-dg-dgux*) host_makefile_frag=config/mh-dgux ;; m68k-apollo-sysv*)
m88k-harris-cxux*) host_makefile_frag=config/mh-cxux ;; host_makefile_frag="${host_makefile_frag} config/mh-apollo68"
m88k-motorola-sysv*) host_makefile_frag=config/mh-delta88;; ;;
mips*-dec-ultrix*) host_makefile_frag=config/mh-decstation ;; m68k-apollo-bsd*)
mips*-nec-sysv4*) host_makefile_frag=config/mh-necv4 ;; host_makefile_frag="${host_makefile_frag} config/mh-a68bsd"
mips*-sgi-irix6*) host_makefile_frag=config/mh-irix6 ;; ;;
mips*-sgi-irix5*) host_makefile_frag=config/mh-irix5 ;; m88k-dg-dgux*)
mips*-sgi-irix4*) host_makefile_frag=config/mh-irix4 ;; host_makefile_frag="${host_makefile_frag} config/mh-dgux"
mips*-sgi-irix3*) host_makefile_frag=config/mh-sysv ;; ;;
mips*-*-sysv4*) host_makefile_frag=config/mh-sysv4 ;; m88k-harris-cxux*)
mips*-*-sysv*) host_makefile_frag=config/mh-riscos ;; host_makefile_frag="${host_makefile_frag} config/mh-cxux"
i[3456]86-*-dgux*) host_makefile_frag=config/mh-dgux386 ;; ;;
i[3456]86-ncr-sysv4.3*) host_makefile_frag=config/mh-ncrsvr43 ;; m88k-motorola-sysv*)
i[3456]86-ncr-sysv4*) host_makefile_frag=config/mh-ncr3000 ;; host_makefile_frag="${host_makefile_frag} config/mh-delta88"
i[3456]86-*-sco3.2v5*) host_makefile_frag=config/mh-sysv ;; ;;
i[3456]86-*-sco*) host_makefile_frag=config/mh-sco ;; mips*-dec-ultrix*)
i[3456]86-*-isc*) host_makefile_frag=config/mh-sysv ;; host_makefile_frag="${host_makefile_frag} config/mh-decstation"
i[3456]86-*-solaris2*) host_makefile_frag=config/mh-sysv4 ;; ;;
i[3456]86-*-aix*) host_makefile_frag=config/mh-aix386 ;; mips*-nec-sysv4*)
i[3456]86-*-go32*) host_makefile_frag=config/mh-go32 ;; host_makefile_frag="${host_makefile_frag} config/mh-necv4"
i[3456]86-*-msdosdjgpp*) host_makefile_frag=config/mh-go32 ;; ;;
*-cygwin32*) host_makefile_frag=config/mh-cygwin32 ;; mips*-sgi-irix6*)
*-windows*) host_makefile_frag=config/mh-windows ;; host_makefile_frag="${host_makefile_frag} config/mh-irix6"
vax-*-ultrix2*) host_makefile_frag=config/mh-vaxult2 ;; ;;
*-*-solaris2*) host_makefile_frag=config/mh-solaris ;; mips*-sgi-irix5*)
m68k-sun-sunos*) host_makefile_frag=config/mh-sun3 ;; host_makefile_frag="${host_makefile_frag} config/mh-irix5"
*-hp-hpux[78]*) host_makefile_frag=config/mh-hpux8 ;; ;;
*-hp-hpux*) host_makefile_frag=config/mh-hpux ;; mips*-sgi-irix4*)
*-*-hiux*) host_makefile_frag=config/mh-hpux ;; host_makefile_frag="${host_makefile_frag} config/mh-irix4"
rs6000-*-lynxos*) host_makefile_frag=config/mh-lynxrs6k ;; ;;
*-*-lynxos*) host_makefile_frag=config/mh-lynxos ;; mips*-sgi-irix3*)
*-*-sysv4*) host_makefile_frag=config/mh-sysv4 ;; host_makefile_frag="${host_makefile_frag} config/mh-sysv"
*-*-sysv*) host_makefile_frag=config/mh-sysv ;; ;;
mips*-*-sysv4*)
host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
;;
mips*-*-sysv*)
host_makefile_frag="${host_makefile_frag} config/mh-riscos"
;;
i[3456]86-*-dgux*)
host_makefile_frag="${host_makefile_frag} config/mh-dgux386"
;;
i[3456]86-ncr-sysv4.3*)
host_makefile_frag="${host_makefile_frag} config/mh-ncrsvr43"
;;
i[3456]86-ncr-sysv4*)
host_makefile_frag="${host_makefile_frag} config/mh-ncr3000"
;;
i[3456]86-*-sco3.2v5*)
host_makefile_frag="${host_makefile_frag} config/mh-sysv"
;;
i[3456]86-*-sco*)
host_makefile_frag="${host_makefile_frag} config/mh-sco"
;;
i[3456]86-*-isc*)
host_makefile_frag="${host_makefile_frag} config/mh-sysv"
;;
i[3456]86-*-solaris2*)
host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
;;
i[3456]86-*-aix*)
host_makefile_frag="${host_makefile_frag} config/mh-aix386"
;;
i[3456]86-*-go32*)
host_makefile_frag="${host_makefile_frag} config/mh-go32"
;;
i[3456]86-*-msdosdjgpp*)
host_makefile_frag="${host_makefile_frag} config/mh-go32"
;;
*-cygwin32*)
host_makefile_frag="${host_makefile_frag} config/mh-cygwin32"
;;
*-windows*)
host_makefile_frag="${host_makefile_frag} config/mh-windows"
;;
vax-*-ultrix2*)
host_makefile_frag="${host_makefile_frag} config/mh-vaxult2"
;;
*-*-solaris2*)
host_makefile_frag="${host_makefile_frag} config/mh-solaris"
;;
m68k-sun-sunos*)
host_makefile_frag="${host_makefile_frag} config/mh-sun3"
;;
*-hp-hpux[78]*)
host_makefile_frag="${host_makefile_frag} config/mh-hpux8"
;;
*-hp-hpux*)
host_makefile_frag="${host_makefile_frag} config/mh-hpux"
;;
*-*-hiux*)
host_makefile_frag="${host_makefile_frag} config/mh-hpux"
;;
rs6000-*-lynxos*)
host_makefile_frag="${host_makefile_frag} config/mh-lynxrs6k"
;;
*-*-lynxos*)
host_makefile_frag="${host_makefile_frag} config/mh-lynxos"
;;
*-*-sysv4*)
host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
;;
*-*-sysv*)
host_makefile_frag="${host_makefile_frag} config/mh-sysv"
;;
esac esac
fi fi
...@@ -186,33 +258,52 @@ case "${enable_shared}" in ...@@ -186,33 +258,52 @@ case "${enable_shared}" in
esac esac
if [ x${shared} = xyes ]; then if [ x${shared} = xyes ]; then
waugh=
case "${host}" in case "${host}" in
hppa*) waugh=config/mh-papic ;; hppa*)
i[3456]86-*) waugh=config/mh-x86pic ;; host_makefile_frag="${host_makefile_frag} config/mh-papic"
sparc64-*) waugh=config/mh-sparcpic ;; ;;
powerpc*-*) waugh=config/mh-ppcpic ;; i[3456]86-*)
alpha-*-linux*) waugh=config/mh-elfalphapic ;; host_makefile_frag="${host_makefile_frag} config/mh-x86pic"
*) waugh=config/mh-${host_cpu}pic ;; ;;
sparc64-*)
host_makefile_frag="${host_makefile_frag} config/mh-sparcpic"
;;
powerpc*-*)
host_makefile_frag="${host_makefile_frag} config/mh-ppcpic"
;;
alpha-*-linux*)
host_makefile_frag="${host_makefile_frag} config/mh-elfalphapic"
;;
*)
host_makefile_frag="${host_makefile_frag} config/mh-${host_cpu}pic"
;;
esac esac
if [ -f ${srcdir}/${waugh} ]; then fi
if [ -n "${host_makefile_frag}" ] ; then
cat ${srcdir}/${host_makefile_frag} > mh-frag rm -f mh-frag
cat ${srcdir}/${waugh} >> mh-frag if [ -n "${host_makefile_frag}" ] ; then
host_makefile_frag=mh-frag for f in ${host_makefile_frag}
else do
host_makefile_frag=${waugh} cat ${srcdir}/$f >> mh-frag
fi done
fi host_makefile_frag=mh-frag
fi fi
# per-target: # per-target:
case "${target}" in case "${target}" in
v810*) target_makefile_frag=config/mt-v810 ;; v810*)
i[3456]86-*-netware*) target_makefile_frag=config/mt-netware ;; target_makefile_frag="${target_makefile_frag} config/mt-v810"
powerpc-*-netware*) target_makefile_frag=config/mt-netware ;; ;;
*-*-linux-gnu) target_makefile_frag=config/mt-linux ;; i[3456]86-*-netware*)
target_makefile_frag="${target_makefile_frag} config/mt-netware"
;;
powerpc-*-netware*)
target_makefile_frag="${target_makefile_frag} config/mt-netware"
;;
*-*-linux-gnu)
target_makefile_frag="${target_makefile_frag} config/mt-linux"
;;
esac esac
skipdirs= skipdirs=
...@@ -416,6 +507,12 @@ case "${target}" in ...@@ -416,6 +507,12 @@ case "${target}" in
alpha*-*-*vms*) alpha*-*-*vms*)
noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss" noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss"
;; ;;
alpha-*-linux*)
# newlib is not 64 bit ready
noconfigdirs="$noconfigdirs target-newlib target-libgloss"
# linux has rx in libc
skipdirs="$skipdirs target-librx"
;;
alpha*-*-*) alpha*-*-*)
# newlib is not 64 bit ready # newlib is not 64 bit ready
noconfigdirs="$noconfigdirs target-newlib target-libgloss" noconfigdirs="$noconfigdirs target-newlib target-libgloss"
...@@ -762,14 +859,33 @@ fi ...@@ -762,14 +859,33 @@ fi
if [ x${shared} = xyes ]; then if [ x${shared} = xyes ]; then
case "${target}" in case "${target}" in
hppa*) target_makefile_frag=config/mt-papic ;; hppa*)
i[3456]86-*) target_makefile_frag=config/mt-x86pic ;; target_makefile_frag="${target_makefile_frag} config/mt-papic"
powerpc*-*) target_makefile_frag=config/mt-ppcpic ;; ;;
alpha-*-linux*) target_makefile_frag=config/mt-elfalphapic ;; i[3456]86-*)
*) target_makefile_frag=config/mt-${target_cpu}pic ;; target_makefile_frag="${target_makefile_frag} config/mt-x86pic"
;;
powerpc*-*)
target_makefile_frag="${target_makefile_frag} config/mt-ppcpic"
;;
alpha-*-linux*)
target_makefile_frag="${target_makefile_frag} config/mt-elfalphapic"
;;
*)
target_makefile_frag="${target_makefile_frag} config/mt-${target_cpu}pic"
;;
esac esac
fi fi
rm -f mt-frag
if [ -n "${target_makefile_frag}" ] ; then
for f in ${target_makefile_frag}
do
cat ${srcdir}/$f >> mt-frag
done
target_makefile_frag=mt-frag
fi
# post-target: # post-target:
# Make sure that the compiler is able to generate an executable. If it # Make sure that the compiler is able to generate an executable. If it
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment