merge from gcc:

2002-07-01  Nathanael Nerode <neroden@gcc.gnu.org>

	* Makefile.in: Eliminate 'apache' targets.
	* configure.in: Eliminate 'apache' targets.

	* configure.in: Eliminate redundant tests.  Reorganize.

	* Makefile.in: Eliminate last reference to LIBGCC1_TEST.

	* config-ml.in: Eliminate references to Cygnus configure.

	* Makefile.in: Eliminate references to building emacs.

2002-07-01  Denis Chertykov  <denisc@overta.ru>

	* configure.in: Add support for ip2k.
This commit is contained in:
DJ Delorie 2002-07-01 23:12:32 +00:00
parent 145564b756
commit f48556b108
3 changed files with 447 additions and 450 deletions

View File

@ -1,3 +1,20 @@
2002-07-01 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.in: Eliminate 'apache' targets.
* configure.in: Eliminate 'apache' targets.
* configure.in: Eliminate redundant tests. Reorganize.
* Makefile.in: Eliminate last reference to LIBGCC1_TEST.
* config-ml.in: Eliminate references to Cygnus configure.
* Makefile.in: Eliminate references to building emacs.
2002-07-01 Denis Chertykov <denisc@overta.ru>
* configure.in: Add support for ip2k.
2002-06-24 Ben Elliston <bje@redhat.com> 2002-06-24 Ben Elliston <bje@redhat.com>
* configure.in (host_tools): Remove cgen. * configure.in (host_tools): Remove cgen.

View File

@ -500,7 +500,6 @@ EXTRA_GCC_FLAGS = \
"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \ "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \ "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \
"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s/.*=$$/XFOO=/`" \ "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s/.*=$$/XFOO=/`" \
"`echo 'LIBGCC1_TEST=$(LIBGCC1_TEST)' | sed -e s/.*=$$/XFOO=/`" \
"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \ "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \ "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \ "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \
@ -525,7 +524,6 @@ CONFIGURE_BUILD_MODULES = \
# This is a list of the targets for all of the modules which are compiled # This is a list of the targets for all of the modules which are compiled
# using $(FLAGS_TO_PASS). # using $(FLAGS_TO_PASS).
ALL_MODULES = \ ALL_MODULES = \
all-apache \
all-ash \ all-ash \
all-autoconf \ all-autoconf \
all-automake \ all-automake \
@ -607,7 +605,6 @@ NATIVE_CHECK_MODULES = \
check-zip check-zip
CROSS_CHECK_MODULES = \ CROSS_CHECK_MODULES = \
check-apache \
check-ash \ check-ash \
check-autoconf \ check-autoconf \
check-automake \ check-automake \
@ -676,7 +673,6 @@ CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
# We put install-tcl before install-itcl because itcl wants to run a # We put install-tcl before install-itcl because itcl wants to run a
# program on installation which uses the Tcl libraries. # program on installation which uses the Tcl libraries.
INSTALL_MODULES = \ INSTALL_MODULES = \
install-apache \
install-ash \ install-ash \
install-autoconf \ install-autoconf \
install-automake \ install-automake \
@ -744,8 +740,6 @@ INSTALL_MODULES = \
# This is a list of the targets for all of the modules which are compiled # This is a list of the targets for all of the modules which are compiled
# using $(X11_FLAGS_TO_PASS). # using $(X11_FLAGS_TO_PASS).
ALL_X11_MODULES = \ ALL_X11_MODULES = \
all-emacs \
all-emacs19 \
all-gdb \ all-gdb \
all-expect \ all-expect \
all-guile \ all-guile \
@ -756,7 +750,6 @@ ALL_X11_MODULES = \
# This is a list of the check targets for all of the modules which are # This is a list of the check targets for all of the modules which are
# compiled using $(X11_FLAGS_TO_PASS). # compiled using $(X11_FLAGS_TO_PASS).
CHECK_X11_MODULES = \ CHECK_X11_MODULES = \
check-emacs \
check-gdb \ check-gdb \
check-guile \ check-guile \
check-expect \ check-expect \
@ -767,8 +760,6 @@ CHECK_X11_MODULES = \
# This is a list of the install targets for all the modules which are # This is a list of the install targets for all the modules which are
# compiled using $(X11_FLAGS_TO_PASS). # compiled using $(X11_FLAGS_TO_PASS).
INSTALL_X11_MODULES = \ INSTALL_X11_MODULES = \
install-emacs \
install-emacs19 \
install-gdb \ install-gdb \
install-guile \ install-guile \
install-expect \ install-expect \
@ -856,7 +847,6 @@ INSTALL_TARGET_MODULES = \
# This is a list of the targets for which we can do a clean-{target}. # This is a list of the targets for which we can do a clean-{target}.
CLEAN_MODULES = \ CLEAN_MODULES = \
clean-apache \
clean-ash \ clean-ash \
clean-autoconf \ clean-autoconf \
clean-automake \ clean-automake \
@ -945,8 +935,6 @@ CLEAN_TARGET_MODULES = \
# All of the x11 modules that can be cleaned # All of the x11 modules that can be cleaned
CLEAN_X11_MODULES = \ CLEAN_X11_MODULES = \
clean-emacs \
clean-emacs19 \
clean-gdb \ clean-gdb \
clean-expect \ clean-expect \
clean-guile \ clean-guile \
@ -1696,7 +1684,6 @@ ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3 ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3
# This is a list of inter-dependencies among modules. # This is a list of inter-dependencies among modules.
all-apache:
all-ash: all-ash:
all-autoconf: all-m4 all-texinfo all-autoconf: all-m4 all-texinfo
all-automake: all-m4 all-texinfo all-automake: all-m4 all-texinfo
@ -1716,8 +1703,6 @@ all-target-cygmon: configure-target-cygmon all-target-libiberty all-target-libst
all-db: all-db:
all-dejagnu: all-tcl all-expect all-tk all-dejagnu: all-tcl all-expect all-tk
all-diff: all-libiberty all-diff: all-libiberty
all-emacs:
all-emacs19: all-bison all-byacc
all-etc: all-etc:
configure-target-examples: $(ALL_GCC_C) configure-target-examples: $(ALL_GCC_C)
all-target-examples: configure-target-examples all-target-examples: configure-target-examples
@ -1746,7 +1731,6 @@ all-hello: all-libiberty
all-indent: all-indent:
all-inet: all-tcl all-send-pr all-perl all-inet: all-tcl all-send-pr all-perl
all-intl: all-intl:
all-ispell: all-emacs19
all-itcl: all-tcl all-tk all-itcl: all-tcl all-tk
all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex all-intl all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex all-intl
configure-target-libgloss: $(ALL_GCC) configure-target-libgloss: $(ALL_GCC)

View File

@ -49,7 +49,7 @@ libstdcxx_version="target-libstdc++-v3"
# these tools are built for the host environment # these tools are built for the host environment
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
# know that we are building the simulator. # know that we are building the simulator.
host_tools="texinfo byacc flex bison binutils ld gas gcc sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip fastjar" host_tools="texinfo byacc flex bison binutils ld gas gcc sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl inet gawk findutils snavigator libtool gettext zip fastjar"
# libgcj represents the runtime libraries only used by gcj. # libgcj represents the runtime libraries only used by gcj.
libgcj="target-libffi \ libgcj="target-libffi \
@ -90,7 +90,7 @@ target_tools="target-examples target-groff target-gperf"
# #
# This must be a single line because of the way it is searched by grep in # This must be a single line because of the way it is searched by grep in
# the code below. # the code below.
native_only="autoconf automake libtool cvssrc fileutils find gawk gettext grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl apache inet time ash bash bzip2 prms snavigator gnuserv target-gperf" native_only="autoconf automake libtool cvssrc fileutils find gawk gettext grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl inet time ash bash bzip2 prms snavigator gnuserv target-gperf"
# directories to be built in a cross environment only # directories to be built in a cross environment only
# #
@ -127,315 +127,6 @@ else
is_cross_compiler=yes is_cross_compiler=yes
fi fi
# Work in distributions that contain no compiler tools, like Autoconf.
tentative_cc=""
if test -d ${srcdir}/config ; then
case "${host}" in
m68k-hp-hpux*)
# Avoid "too much defining" errors from HPUX compiler.
tentative_cc="cc -Wp,-H256000"
host_makefile_frag="config/mh-hp300"
;;
m68k-apollo-sysv*)
tentative_cc="cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DUSG"
host_makefile_frag="config/mh-apollo68"
;;
m68k-apollo-bsd*)
#None of the Apollo compilers can compile gas or binutils. The preprocessor
# chokes on bfd, the compiler won't let you assign integers to enums, and
# other problems. Defining CC to gcc is a questionable way to say "don't use
# the apollo compiler" (the preferred version of GCC could be called cc,
# or whatever), but I'm not sure leaving CC as cc is any better...
#CC=cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_STDARG
tentative_cc=gcc
host_makefile_frag="config/mh-a68bsd"
;;
m88k-dg-dgux*)
tentative_cc="gcc -Wall -ansi -D__using_DGUX"
host_makefile_frag="config/mh-dgux"
;;
m88k-harris-cxux*)
# Under CX/UX, we want to tell the compiler to use ANSI mode.
tentative_cc="cc -Xa"
host_makefile_frag="config/mh-cxux"
;;
m88k-motorola-sysv*)
host_makefile_frag="config/mh-delta88"
;;
mips*-dec-ultrix*)
tentative_cc="cc -Wf,-XNg1000"
host_makefile_frag="config/mh-decstation"
;;
mips*-nec-sysv4*)
# The C compiler on NEC MIPS SVR4 needs bigger tables.
tentative_cc="cc -ZXNd=5000 -ZXNg=1000"
host_makefile_frag="config/mh-necv4"
;;
mips*-sgi-irix6*)
host_makefile_frag="config/mh-irix6"
;;
mips*-sgi-irix5*)
host_makefile_frag="config/mh-irix5"
;;
mips*-sgi-irix4*)
# Tell compiler to use K&R C. We can't compile under the SGI Ansi
# environment. Also bump switch table size so that cp-parse will
# compile. Bump string length limit so linker builds.
tentative_cc="cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh2000 -Wf,-XNl8192"
;;
mips*-sgi-irix3*)
host_makefile_frag="config/mh-sysv"
;;
mips*-*-sysv4*)
host_makefile_frag="config/mh-sysv4"
;;
mips*-*-sysv*)
# This is for a MIPS running RISC/os 4.52C.
# This is needed for GDB, but needs to be in the top-level make because
# if a library is compiled with the bsd headers and gets linked with the
# sysv system libraries all hell can break loose (e.g. a jmp_buf might be
# a different size).
# ptrace(2) apparently has problems in the BSD environment. No workaround is
# known except to select the sysv environment. Could we use /proc instead?
# These "sysv environments" and "bsd environments" often end up being a pain.
#
# This is not part of CFLAGS because perhaps not all C compilers have this
# option.
tentative_cc="cc -systype sysv"
host_makefile_frag="config/mh-riscos"
;;
i370-ibm-opened*)
tentative_cc="c89"
host_makefile_frag="config/mh-openedition"
;;
i[3456]86-*-sysv5*)
host_makefile_frag="config/mh-sysv5"
;;
i[3456]86-*-dgux*)
tentative_cc="gcc -Wall -ansi -D__using_DGUX"
host_makefile_frag="config/mh-dgux386"
;;
i[3456]86-ncr-sysv4.3*)
# The MetaWare compiler will generate a copyright message unless you
# turn it off by adding the -Hnocopyr flag.
tentative_cc="cc -Hnocopyr"
host_makefile_frag="config/mh-ncrsvr43"
;;
i[3456]86-ncr-sysv4*)
# for an NCR 3000 (i486/SVR4) system.
# The NCR 3000 ships with a MetaWare compiler installed as /bin/cc.
# This compiler not only emits obnoxious copyright messages every time
# you run it, but it chokes and dies on a whole bunch of GNU source
# files. Default to using the AT&T compiler installed in /usr/ccs/ATT/cc.
tentative_cc="/usr/ccs/ATT/cc"
host_makefile_frag="config/mh-ncr3000"
;;
i[3456]86-*-sco3.2v5*)
host_makefile_frag="config/mh-sysv"
;;
i[3456]86-*-sco*)
# The native C compiler botches some simple uses of const. Unfortunately,
# it doesn't defined anything like "__sco__" for us to test for in ansidecl.h.
tentative_cc="cc -Dconst="
host_makefile_frag="config/mh-sco"
;;
i[3456]86-*-udk*)
host_makefile_frag="config/mh-sysv5"
;;
i[3456]86-*-isc*)
host_makefile_frag="config/mh-sysv"
;;
i[3456]86-*-solaris2*)
host_makefile_frag="config/mh-sysv4"
;;
i[3456]86-*-aix*)
host_makefile_frag="config/mh-aix386"
;;
i[3456]86-*-msdosdjgpp*)
host_makefile_frag="config/mh-djgpp"
;;
*-cygwin*)
host_makefile_frag="config/mh-cygwin"
;;
*-mingw32*)
host_makefile_frag="config/mh-mingw32"
;;
*-interix*)
host_makefile_frag="config/mh-interix"
;;
vax-*-ultrix2*)
# The old BSD pcc isn't up to compiling parts of gdb so use gcc
tentative_cc=gcc
;;
*-*-solaris2*)
host_makefile_frag="config/mh-solaris"
;;
m68k-sun-sunos*)
# Sun's C compiler needs the -J flag to be able to compile cp-parse.c
# without overflowing the jump tables (-J says to use a 32 bit table)
tentative_cc="cc -J"
;;
*-hp-hpux[78]*)
tentative_cc="cc -Wp,-H256000"
host_makefile_frag="config/mh-hpux8"
;;
*-hp-hpux*)
tentative_cc="cc -Wp,-H256000"
host_makefile_frag="config/mh-hpux"
;;
*-*-hiux*)
tentative_cc="cc -Wp,-H256000"
host_makefile_frag="config/mh-hpux"
;;
rs6000-*-lynxos*)
# /bin/cc is less than useful for our purposes. Always use GCC
tentative_cc="/usr/cygnus/progressive/bin/gcc"
host_makefile_frag="config/mh-lynxrs6k"
;;
*-*-lynxos*)
# /bin/cc is less than useful for our purposes. Always use GCC
tentative_cc="/bin/gcc"
;;
*-*-sysv4*)
host_makefile_frag="config/mh-sysv4"
;;
*-*-sysv*)
host_makefile_frag="config/mh-sysv"
;;
esac
fi
# If we aren't going to be using gcc, see if we can extract a definition
# of CC from the fragment.
# Actually, use the 'pre-extracted' version above.
if test -z "${CC}" && test "${build}" = "${host}" ; then
IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
found=
for dir in $PATH; do
test -z "$dir" && dir=.
if test -f $dir/gcc; then
found=yes
break
fi
done
IFS="$save_ifs"
if test -z "${found}" && test -n "${tentative_cc}" ; then
CC=$tentative_cc
fi
fi
# We default to --with-shared on platforms where -fpic is meaningless.
# Well, we don't yet, but we will.
if false && test "${host}" = "${target}" && test x${enable_shared} = x ; then
case "${target}" in
alpha*-dec-osf*) enable_shared=yes ;;
alpha*-*-linux*) enable_shared=yes ;;
mips-sgi-irix5*) enable_shared=yes ;;
*) enable_shared=no ;;
esac
fi
# hpux11 in 64bit mode has libraries in a weird place. Arrange to find
# them automatically.
case "${host}" in
hppa*64*-*-hpux11*)
withoptions="$withoptions -x-libraries=/usr/lib/pa20_64 -x-includes=/usr/X11R6/include"
;;
esac
case "${enable_shared}" in
yes) shared=yes ;;
no) shared=no ;;
"") shared=no ;;
*) shared=yes ;;
esac
rm -f mh-frag
if test -n "${host_makefile_frag}" ; then
for f in ${host_makefile_frag}
do
cat ${srcdir}/$f >> mh-frag
done
host_makefile_frag=mh-frag
fi
case "${target}" in
v810*)
target_makefile_frag="${target_makefile_frag} config/mt-v810"
;;
i[3456]86-*-netware*)
target_makefile_frag="${target_makefile_frag} config/mt-netware"
;;
powerpc-*-netware*)
target_makefile_frag="${target_makefile_frag} config/mt-netware"
;;
alpha*-*-linux*)
target_makefile_frag="${target_makefile_frag} config/mt-linux"
target_makefile_frag="${target_makefile_frag} config/mt-alphaieee"
;;
alpha*-*-*)
target_makefile_frag="${target_makefile_frag} config/mt-alphaieee"
;;
*-*-linux*)
target_makefile_frag="${target_makefile_frag} config/mt-linux"
;;
*-*-aix4.[3456789]* | *-*-aix[56789].*)
target_makefile_frag="${target_makefile_frag} config/mt-aix43"
;;
mips*-*-pe | sh*-*-pe | *arm-wince-pe)
target_makefile_frag="${target_makefile_frag} config/mt-wince"
;;
esac
# If --enable-target-optspace always use -Os instead of -O2 to build
# the target libraries, similarly if it is not specified, use -Os
# on selected platforms.
case "${enable_target_optspace}:${target}" in
yes:*)
target_makefile_frag="${target_makefile_frag} config/mt-ospace"
;;
:d30v-*)
target_makefile_frag="${target_makefile_frag} config/mt-d30v"
;;
:m32r-* | :d10v-* | :fr30-*)
target_makefile_frag="${target_makefile_frag} config/mt-ospace"
;;
no:* | :*)
;;
*)
echo "*** bad value \"${enable_target_optspace}\" for --enable-target-optspace flag; ignored" 1>&2
;;
esac
skipdirs=
use_gnu_ld=
use_gnu_as=
# some tools are so dependent upon X11 that if we're not building with X,
# it's not even worth trying to configure, much less build, that tool.
case ${with_x} in
yes | "") # the default value for this tree is that X11 is available
;;
no)
skipdirs="${skipdirs} tk libgui"
;;
*)
echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2
;;
esac
# Some tools are only suitable for building in a "native" situation.
# Those are added when we have a host==target configuration. For cross
# toolchains, we add some directories that should only be useful in a
# cross-compiler.
case $is_cross_compiler in
no) skipdirs="${skipdirs} ${cross_only}" ;;
yes) skipdirs="${skipdirs} ${native_only}" ;;
esac
# We always want to use the same name for this directory, so that dejagnu # We always want to use the same name for this directory, so that dejagnu
# can reliably find it. # can reliably find it.
target_subdir=${target_alias} target_subdir=${target_alias}
@ -460,70 +151,42 @@ if test x"${build_alias}" != x"${host}" ; then
fi fi
fi fi
copy_dirs= # Skipdirs are removed silently.
skipdirs=
# Noconfigdirs are removed loudly.
noconfigdirs=""
# Handle --with-headers=XXX. The contents of the named directory are use_gnu_ld=
# copied to $(tooldir)/sys-include. # Make sure we don't let GNU ld be added if we didn't want it.
if test x"${with_headers}" != x ; then if test x$with_gnu_ld = xno ; then
if test x${is_cross_compiler} = xno ; then use_gnu_ld=no
echo 1>&2 '***' --with-headers is only supported when cross compiling noconfigdirs="$noconfigdirs ld"
exit 1
fi
case "${exec_prefixoption}" in
"") x=${prefix} ;;
*) x=${exec_prefix} ;;
esac
copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include"
fi fi
# Handle --with-libs=XXX. Multiple directories are permitted. The use_gnu_as=
# contents are copied to $(tooldir)/lib. # Make sure we don't let GNU as be added if we didn't want it.
if test x"${with_libs}" != x ; then if test x$with_gnu_as = xno ; then
if test x${is_cross_compiler} = xno ; then use_gnu_as=no
echo 1>&2 '***' --with-libs is only supported when cross compiling noconfigdirs="$noconfigdirs gas"
exit 1
fi
# Copy the libraries in reverse order, so that files in the first named
# library override files in subsequent libraries.
case "${exec_prefixoption}" in
"") x=${prefix} ;;
*) x=${exec_prefix} ;;
esac
for l in ${with_libs}; do
copy_dirs="$l $x/${target_alias}/lib ${copy_dirs}"
done
fi fi
# Handle ${copy_dirs} # some tools are so dependent upon X11 that if we're not building with X,
set fnord ${copy_dirs} # it's not even worth trying to configure, much less build, that tool.
shift
while test $# != 0 ; do
if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
:
else
echo Copying $1 to $2
# Use the install script to create the directory and all required case ${with_x} in
# parent directories. yes | "") ;; # the default value for this tree is that X11 is available
if test -d $2 ; then no) skipdirs="${skipdirs} tk libgui" ;;
: *) echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;;
else esac
echo >config.temp
${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
fi
# Copy the directory, assuming we have tar. # Some tools are only suitable for building in a "native" situation.
# FIXME: Should we use B in the second tar? Not all systems support it. # Remove these if host!=target. Similarly, some are only suitable
(cd $1; tar -cf - .) | (cd $2; tar -xpf -) # for cross toolchains; remove if host=target.
# It is the responsibility of the user to correctly adjust all case $is_cross_compiler in
# symlinks. If somebody can figure out how to handle them correctly no) skipdirs="${skipdirs} ${cross_only}" ;;
# here, feel free to add the code. yes) skipdirs="${skipdirs} ${native_only}" ;;
esac
echo $1 > $2/COPIED
fi
shift; shift
done
# If both --with-headers and --with-libs are specified, default to # If both --with-headers and --with-libs are specified, default to
# --without-newlib. # --without-newlib.
@ -539,60 +202,46 @@ case ${with_newlib} in
yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;; yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;;
esac esac
# Default to using --with-stabs for certain targets.
if test x${with_stabs} = x ; then
case "${target}" in
mips*-*-irix6*)
;;
mips*-*-* | alpha*-*-osf*)
with_stabs=yes;
withoptions="${withoptions} --with-stabs"
;;
esac
fi
# Configure extra directories which are host specific # Configure extra directories which are host specific
case "${host}" in case "${host}" in
i[3456]86-*-go32*) i[3456]86-*-go32*)
configdirs="$configdirs dosrel" ;; configdirs="$configdirs dosrel" ;;
i[3456]86-*-mingw32*) i[3456]86-*-mingw32*)
configdirs="$configdirs dosrel" ;; configdirs="$configdirs dosrel" ;;
*-cygwin*) *-cygwin*)
configdirs="$configdirs libtermcap dosrel" ;; configdirs="$configdirs libtermcap dosrel" ;;
esac esac
# Remove more programs from consideration, based on the host or # Remove more programs from consideration, based on the host or
# target this usually means that a port of the program doesn't # target this usually means that a port of the program doesn't
# exist yet. # exist yet.
noconfigdirs=""
case "${host}" in case "${host}" in
hppa*64*-*-*) hppa*64*-*-*)
noconfigdirs="$noconfigdirs byacc" noconfigdirs="$noconfigdirs byacc"
;; ;;
i[3456]86-*-vsta) i[3456]86-*-vsta)
noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv gettext" noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl inet itcl tix db snavigator gnuserv gettext"
;; ;;
i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*) i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*)
noconfigdirs="tcl tk expect dejagnu send-pr uudecode guile apache inet itcl tix db snavigator gnuserv libffi" noconfigdirs="tcl tk expect dejagnu send-pr uudecode guile inet itcl tix db snavigator gnuserv libffi"
;; ;;
i[3456]86-*-mingw32*) i[3456]86-*-mingw32*)
# noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv" # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl inet itcl tix db snavigator gnuserv"
noconfigdirs="expect dejagnu cvs autoconf automake send-pr rcs guile perl texinfo apache inet libtool" noconfigdirs="expect dejagnu cvs autoconf automake send-pr rcs guile perl texinfo inet libtool"
;; ;;
i[3456]86-*-beos*) i[3456]86-*-beos*)
noconfigdirs="$noconfigdirs tk itcl tix libgui gdb" noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
;; ;;
*-*-cygwin*) *-*-cygwin*)
noconfigdirs="autoconf automake send-pr rcs guile perl apache inet" noconfigdirs="autoconf automake send-pr rcs guile perl inet"
;; ;;
*-*-netbsd*) *-*-netbsd*)
noconfigdirs="rcs" noconfigdirs="rcs"
;; ;;
ppc*-*-pe) ppc*-*-pe)
noconfigdirs="patch diff make tk tcl expect dejagnu cvssrc autoconf automake texinfo bison send-pr gprof rcs guile perl apache inet itcl tix db snavigator gnuserv" noconfigdirs="patch diff make tk tcl expect dejagnu cvssrc autoconf automake texinfo bison send-pr gprof rcs guile perl inet itcl tix db snavigator gnuserv"
;; ;;
powerpc-*-beos*) powerpc-*-beos*)
noconfigdirs="$noconfigdirs tk itcl tix libgui gdb dejagnu readline" noconfigdirs="$noconfigdirs tk itcl tix libgui gdb dejagnu readline"
@ -1017,6 +666,9 @@ case "${target}" in
vax-*-*) vax-*-*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
;; ;;
ip2k-*-*)
noconfigdirs="$noconfigdirs target-libiberty ${libstdcxx_version} ${libgcj}"
;;
*-*-lynxos*) *-*-lynxos*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
;; ;;
@ -1038,18 +690,6 @@ case "${noconfigdirs}" in
*target-newlib*) noconfigdirs="$noconfigdirs target-libgloss" ;; *target-newlib*) noconfigdirs="$noconfigdirs target-libgloss" ;;
esac esac
# Make sure we don't let GNU ld be added if we didn't want it.
if test x$with_gnu_ld = xno ; then
use_gnu_ld=no
noconfigdirs="$noconfigdirs ld"
fi
# Make sure we don't let GNU as be added if we didn't want it.
if test x$with_gnu_as = xno ; then
use_gnu_as=no
noconfigdirs="$noconfigdirs gas"
fi
# Figure out what language subdirectories are present. # Figure out what language subdirectories are present.
# Look if the user specified --enable-languages="..."; if not, use # Look if the user specified --enable-languages="..."; if not, use
# the environment variable $LANGUAGES if defined. $LANGUAGES might # the environment variable $LANGUAGES if defined. $LANGUAGES might
@ -1253,6 +893,347 @@ if test -n "${notsupp}" && test -z "${norecursion}" ; then
echo " (Any other directories should still work fine.)" 1>&2 echo " (Any other directories should still work fine.)" 1>&2
fi fi
case "$host" in
*msdosdjgpp*)
enable_gdbtk=no ;;
esac
# Determine whether gdb needs tk/tcl or not.
case "$enable_gdbtk" in
no)
GDB_TK="" ;;
*)
GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui" ;;
esac
copy_dirs=
# Handle --with-headers=XXX. The contents of the named directory are
# copied to $(tooldir)/sys-include.
if test x"${with_headers}" != x ; then
if test x${is_cross_compiler} = xno ; then
echo 1>&2 '***' --with-headers is only supported when cross compiling
exit 1
fi
case "${exec_prefixoption}" in
"") x=${prefix} ;;
*) x=${exec_prefix} ;;
esac
copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include"
fi
# Handle --with-libs=XXX. Multiple directories are permitted. The
# contents are copied to $(tooldir)/lib.
if test x"${with_libs}" != x ; then
if test x${is_cross_compiler} = xno ; then
echo 1>&2 '***' --with-libs is only supported when cross compiling
exit 1
fi
# Copy the libraries in reverse order, so that files in the first named
# library override files in subsequent libraries.
case "${exec_prefixoption}" in
"") x=${prefix} ;;
*) x=${exec_prefix} ;;
esac
for l in ${with_libs}; do
copy_dirs="$l $x/${target_alias}/lib ${copy_dirs}"
done
fi
# Handle ${copy_dirs}
set fnord ${copy_dirs}
shift
while test $# != 0 ; do
if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
:
else
echo Copying $1 to $2
# Use the install script to create the directory and all required
# parent directories.
if test -d $2 ; then
:
else
echo >config.temp
${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
fi
# Copy the directory, assuming we have tar.
# FIXME: Should we use B in the second tar? Not all systems support it.
(cd $1; tar -cf - .) | (cd $2; tar -xpf -)
# It is the responsibility of the user to correctly adjust all
# symlinks. If somebody can figure out how to handle them correctly
# here, feel free to add the code.
echo $1 > $2/COPIED
fi
shift; shift
done
# Work in distributions that contain no compiler tools, like Autoconf.
tentative_cc=""
if test -d ${srcdir}/config ; then
case "${host}" in
m68k-hp-hpux*)
# Avoid "too much defining" errors from HPUX compiler.
tentative_cc="cc -Wp,-H256000"
host_makefile_frag="config/mh-hp300"
;;
m68k-apollo-sysv*)
tentative_cc="cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DUSG"
host_makefile_frag="config/mh-apollo68"
;;
m68k-apollo-bsd*)
#None of the Apollo compilers can compile gas or binutils. The preprocessor
# chokes on bfd, the compiler won't let you assign integers to enums, and
# other problems. Defining CC to gcc is a questionable way to say "don't use
# the apollo compiler" (the preferred version of GCC could be called cc,
# or whatever), but I'm not sure leaving CC as cc is any better...
#CC=cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_STDARG
tentative_cc=gcc
host_makefile_frag="config/mh-a68bsd"
;;
m88k-dg-dgux*)
tentative_cc="gcc -Wall -ansi -D__using_DGUX"
host_makefile_frag="config/mh-dgux"
;;
m88k-harris-cxux*)
# Under CX/UX, we want to tell the compiler to use ANSI mode.
tentative_cc="cc -Xa"
host_makefile_frag="config/mh-cxux"
;;
m88k-motorola-sysv*)
host_makefile_frag="config/mh-delta88"
;;
mips*-dec-ultrix*)
tentative_cc="cc -Wf,-XNg1000"
host_makefile_frag="config/mh-decstation"
;;
mips*-nec-sysv4*)
# The C compiler on NEC MIPS SVR4 needs bigger tables.
tentative_cc="cc -ZXNd=5000 -ZXNg=1000"
host_makefile_frag="config/mh-necv4"
;;
mips*-sgi-irix6*)
host_makefile_frag="config/mh-irix6"
;;
mips*-sgi-irix5*)
host_makefile_frag="config/mh-irix5"
;;
mips*-sgi-irix4*)
# Tell compiler to use K&R C. We can't compile under the SGI Ansi
# environment. Also bump switch table size so that cp-parse will
# compile. Bump string length limit so linker builds.
tentative_cc="cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh2000 -Wf,-XNl8192"
;;
mips*-sgi-irix3*)
host_makefile_frag="config/mh-sysv"
;;
mips*-*-sysv4*)
host_makefile_frag="config/mh-sysv4"
;;
mips*-*-sysv*)
# This is for a MIPS running RISC/os 4.52C.
# This is needed for GDB, but needs to be in the top-level make because
# if a library is compiled with the bsd headers and gets linked with the
# sysv system libraries all hell can break loose (e.g. a jmp_buf might be
# a different size).
# ptrace(2) apparently has problems in the BSD environment. No workaround is
# known except to select the sysv environment. Could we use /proc instead?
# These "sysv environments" and "bsd environments" often end up being a pain.
#
# This is not part of CFLAGS because perhaps not all C compilers have this
# option.
tentative_cc="cc -systype sysv"
host_makefile_frag="config/mh-riscos"
;;
i370-ibm-opened*)
tentative_cc="c89"
host_makefile_frag="config/mh-openedition"
;;
i[3456]86-*-sysv5*)
host_makefile_frag="config/mh-sysv5"
;;
i[3456]86-*-dgux*)
tentative_cc="gcc -Wall -ansi -D__using_DGUX"
host_makefile_frag="config/mh-dgux386"
;;
i[3456]86-ncr-sysv4.3*)
# The MetaWare compiler will generate a copyright message unless you
# turn it off by adding the -Hnocopyr flag.
tentative_cc="cc -Hnocopyr"
host_makefile_frag="config/mh-ncrsvr43"
;;
i[3456]86-ncr-sysv4*)
# for an NCR 3000 (i486/SVR4) system.
# The NCR 3000 ships with a MetaWare compiler installed as /bin/cc.
# This compiler not only emits obnoxious copyright messages every time
# you run it, but it chokes and dies on a whole bunch of GNU source
# files. Default to using the AT&T compiler installed in /usr/ccs/ATT/cc.
tentative_cc="/usr/ccs/ATT/cc"
host_makefile_frag="config/mh-ncr3000"
;;
i[3456]86-*-sco3.2v5*)
host_makefile_frag="config/mh-sysv"
;;
i[3456]86-*-sco*)
# The native C compiler botches some simple uses of const. Unfortunately,
# it doesn't defined anything like "__sco__" for us to test for in ansidecl.h.
tentative_cc="cc -Dconst="
host_makefile_frag="config/mh-sco"
;;
i[3456]86-*-udk*)
host_makefile_frag="config/mh-sysv5"
;;
i[3456]86-*-isc*)
host_makefile_frag="config/mh-sysv"
;;
i[3456]86-*-solaris2*)
host_makefile_frag="config/mh-sysv4"
;;
i[3456]86-*-aix*)
host_makefile_frag="config/mh-aix386"
;;
i[3456]86-*-msdosdjgpp*)
host_makefile_frag="config/mh-djgpp"
;;
*-cygwin*)
host_makefile_frag="config/mh-cygwin"
;;
*-mingw32*)
host_makefile_frag="config/mh-mingw32"
;;
*-interix*)
host_makefile_frag="config/mh-interix"
;;
vax-*-ultrix2*)
# The old BSD pcc isn't up to compiling parts of gdb so use gcc
tentative_cc=gcc
;;
*-*-solaris2*)
host_makefile_frag="config/mh-solaris"
;;
m68k-sun-sunos*)
# Sun's C compiler needs the -J flag to be able to compile cp-parse.c
# without overflowing the jump tables (-J says to use a 32 bit table)
tentative_cc="cc -J"
;;
*-hp-hpux[78]*)
tentative_cc="cc -Wp,-H256000"
host_makefile_frag="config/mh-hpux8"
;;
*-hp-hpux*)
tentative_cc="cc -Wp,-H256000"
host_makefile_frag="config/mh-hpux"
;;
*-*-hiux*)
tentative_cc="cc -Wp,-H256000"
host_makefile_frag="config/mh-hpux"
;;
rs6000-*-lynxos*)
# /bin/cc is less than useful for our purposes. Always use GCC
tentative_cc="/usr/cygnus/progressive/bin/gcc"
host_makefile_frag="config/mh-lynxrs6k"
;;
*-*-lynxos*)
# /bin/cc is less than useful for our purposes. Always use GCC
tentative_cc="/bin/gcc"
;;
*-*-sysv4*)
host_makefile_frag="config/mh-sysv4"
;;
*-*-sysv*)
host_makefile_frag="config/mh-sysv"
;;
esac
fi
rm -f mh-frag
if test -n "${host_makefile_frag}" ; then
for f in ${host_makefile_frag}
do
cat ${srcdir}/$f >> mh-frag
done
host_makefile_frag=mh-frag
fi
# If we aren't going to be using gcc, see if we can extract a definition
# of CC from the fragment.
# Actually, use the 'pre-extracted' version above.
if test -z "${CC}" && test "${build}" = "${host}" ; then
IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
found=
for dir in $PATH; do
test -z "$dir" && dir=.
if test -f $dir/gcc; then
found=yes
break
fi
done
IFS="$save_ifs"
if test -z "${found}" && test -n "${tentative_cc}" ; then
CC=$tentative_cc
fi
fi
case "${target}" in
v810*)
target_makefile_frag="${target_makefile_frag} config/mt-v810"
;;
i[3456]86-*-netware*)
target_makefile_frag="${target_makefile_frag} config/mt-netware"
;;
powerpc-*-netware*)
target_makefile_frag="${target_makefile_frag} config/mt-netware"
;;
alpha*-*-linux*)
target_makefile_frag="${target_makefile_frag} config/mt-linux"
target_makefile_frag="${target_makefile_frag} config/mt-alphaieee"
;;
alpha*-*-*)
target_makefile_frag="${target_makefile_frag} config/mt-alphaieee"
;;
*-*-linux*)
target_makefile_frag="${target_makefile_frag} config/mt-linux"
;;
*-*-aix4.[3456789]* | *-*-aix[56789].*)
target_makefile_frag="${target_makefile_frag} config/mt-aix43"
;;
mips*-*-pe | sh*-*-pe | *arm-wince-pe)
target_makefile_frag="${target_makefile_frag} config/mt-wince"
;;
esac
# If --enable-target-optspace always use -Os instead of -O2 to build
# the target libraries, similarly if it is not specified, use -Os
# on selected platforms.
case "${enable_target_optspace}:${target}" in
yes:*)
target_makefile_frag="${target_makefile_frag} config/mt-ospace"
;;
:d30v-*)
target_makefile_frag="${target_makefile_frag} config/mt-d30v"
;;
:m32r-* | :d10v-* | :fr30-*)
target_makefile_frag="${target_makefile_frag} config/mt-ospace"
;;
no:* | :*)
;;
*)
echo "*** bad value \"${enable_target_optspace}\" for --enable-target-optspace flag; ignored" 1>&2
;;
esac
rm -f mt-frag
if test -n "${target_makefile_frag}" ; then
for f in ${target_makefile_frag}
do
cat ${srcdir}/$f >> mt-frag
done
target_makefile_frag=mt-frag
fi
# Set with_gnu_as and with_gnu_ld as appropriate. # Set with_gnu_as and with_gnu_ld as appropriate.
# #
# This is done by determining whether or not the appropriate directory # This is done by determining whether or not the appropriate directory
@ -1266,47 +1247,63 @@ fi
# want to do that, then you should use the --without-gnu-as and # want to do that, then you should use the --without-gnu-as and
# --without-gnu-ld options for the configure script. # --without-gnu-ld options for the configure script.
if test x${use_gnu_as} = x ; then if test x${use_gnu_as} = x &&
if test x${with_gnu_as} != xno && echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 && test -d ${srcdir}/gas ; then echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
with_gnu_as=yes with_gnu_as=yes
withoptions="$withoptions --with-gnu-as" withoptions="$withoptions --with-gnu-as"
fi
fi fi
if test x${use_gnu_ld} = x ; then if test x${use_gnu_ld} = x &&
if test x${with_gnu_ld} != xno && echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 && test -d ${srcdir}/ld ; then echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then
with_gnu_ld=yes with_gnu_ld=yes
withoptions="$withoptions --with-gnu-ld" withoptions="$withoptions --with-gnu-ld"
fi
fi fi
# If using newlib, add --with-newlib to the withoptions so that gcc/configure # If using newlib, add --with-newlib to the withoptions so that gcc/configure
# can detect this case. # can detect this case.
if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 && test -d ${srcdir}/newlib ; then if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
with_newlib=yes with_newlib=yes
withoptions="$withoptions --with-newlib" withoptions="$withoptions --with-newlib"
fi fi
rm -f mt-frag # We default to --with-shared on platforms where -fpic is meaningless.
if test -n "${target_makefile_frag}" ; then # Well, we don't yet, but we will.
for f in ${target_makefile_frag} if false && test "${host}" = "${target}" && test x${enable_shared} = x ; then
do case "${target}" in
cat ${srcdir}/$f >> mt-frag alpha*-dec-osf*) enable_shared=yes ;;
done alpha*-*-linux*) enable_shared=yes ;;
target_makefile_frag=mt-frag mips-sgi-irix5*) enable_shared=yes ;;
*) enable_shared=no ;;
esac
fi fi
case "$host" in case "${enable_shared}" in
*msdosdjgpp*) yes) shared=yes ;;
enable_gdbtk=no ;; no) shared=no ;;
"") shared=no ;;
*) shared=yes ;;
esac esac
# Determine whether gdb needs tk/tcl or not.
case "$enable_gdbtk" in
no) # Default to using --with-stabs for certain targets.
GDB_TK="" ;; if test x${with_stabs} = x ; then
*) case "${target}" in
GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui" ;; mips*-*-irix6*)
;;
mips*-*-* | alpha*-*-osf*)
with_stabs=yes;
withoptions="${withoptions} --with-stabs"
;;
esac
fi
# hpux11 in 64bit mode has libraries in a weird place. Arrange to find
# them automatically.
case "${host}" in
hppa*64*-*-hpux11*)
withoptions="$withoptions -x-libraries=/usr/lib/pa20_64 -x-includes=/usr/X11R6/include"
;;
esac esac
# post-target: # post-target:
@ -1517,8 +1514,7 @@ if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then
fi fi
if test "x${use_gnu_ld}" = x && test "x${with_gnu_ld}" != xno && if test "x${use_gnu_ld}" = x && test "x${with_gnu_ld}" != xno &&
echo " ${configdirs} " | grep " ld " > /dev/null && echo " ${configdirs} " | grep " ld " > /dev/null ; then
test -d ${srcdir}/ld; then
# Arrange for us to find uninstalled linker scripts. # Arrange for us to find uninstalled linker scripts.
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/ld' FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/ld'
fi fi