merge with gcc
This commit is contained in:
Jason Merrill
156
configure.in
156
configure.in
@@ -47,6 +47,13 @@ if [ "${enable_gdbgui}" = "yes" ] ; then
|
||||
host_libs="${host_libs} libgui"
|
||||
fi
|
||||
|
||||
# Set up configure/Makefile variables if libstdc++-v3 is to be built.
|
||||
if [ "${enable_libstdcxx_v3}" = "yes" ] ; then
|
||||
libstdcxx_version="target-libstdc++-v3"
|
||||
else
|
||||
libstdcxx_version="target-libio target-libstdc++"
|
||||
fi
|
||||
|
||||
# these tools are built for the host environment
|
||||
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
|
||||
# know that we are building the simulator.
|
||||
@@ -58,10 +65,15 @@ host_tools="texinfo byacc flex bison binutils ld gas gcc sim gdb make patch prms
|
||||
target_libs="target-libiberty \
|
||||
target-libgloss \
|
||||
target-newlib \
|
||||
target-libio \
|
||||
target-librx \
|
||||
target-libstdc++ \
|
||||
target-libg++"
|
||||
${libstdcxx_version} \
|
||||
target-libf2c \
|
||||
target-libchill \
|
||||
target-libffi \
|
||||
target-libjava \
|
||||
target-zlib \
|
||||
target-boehm-gc \
|
||||
target-qthreads \
|
||||
target-libobjc"
|
||||
|
||||
# these tools are built using the target libs, and are intended to run only
|
||||
# in the target environment
|
||||
@@ -154,6 +166,9 @@ case "${host}" in
|
||||
mips*-*-sysv*)
|
||||
host_makefile_frag="${host_makefile_frag} config/mh-riscos"
|
||||
;;
|
||||
i370-ibm-opened*)
|
||||
host_makefile_frag="${host_makefile_frag} config/mh-openedition"
|
||||
;;
|
||||
i[3456]86-*-sysv5*)
|
||||
host_makefile_frag="${host_makefile_frag} config/mh-sysv5"
|
||||
;;
|
||||
@@ -291,6 +306,9 @@ if [ x${shared} = xyes ]; then
|
||||
i370-*-*)
|
||||
host_makefile_frag="${host_makefile_frag} config/mh-i370pic"
|
||||
;;
|
||||
ia64-*-*)
|
||||
host_makefile_frag="${host_makefile_frag} config/mh-ia64pic"
|
||||
;;
|
||||
sparc64-*-*)
|
||||
host_makefile_frag="${host_makefile_frag} config/mh-sparcpic"
|
||||
;;
|
||||
@@ -524,7 +542,7 @@ case "${host}" in
|
||||
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"
|
||||
;;
|
||||
i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*)
|
||||
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 gettext"
|
||||
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 gettext libffi"
|
||||
;;
|
||||
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"
|
||||
@@ -542,18 +560,21 @@ case "${host}" in
|
||||
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"
|
||||
;;
|
||||
powerpc-*-beos*)
|
||||
noconfigdirs="$noconfigdirs tk itcl tix libgui gdb dejagnu readline"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
case "${target}" in
|
||||
*-*-netware)
|
||||
noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-librx target-newlib target-libiberty target-libgloss"
|
||||
noconfigdirs="$noconfigdirs ${libstdcxx_version} target-newlib target-libiberty target-libgloss target-libffi"
|
||||
;;
|
||||
*-*-rtems*)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
*-*-vxworks*)
|
||||
noconfigdirs="$noconfigdirs target-newlib target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libffi"
|
||||
;;
|
||||
alpha*-dec-osf*)
|
||||
# ld works, but does not support shared libraries. emacs doesn't
|
||||
@@ -562,13 +583,7 @@ case "${target}" in
|
||||
noconfigdirs="$noconfigdirs gas ld emacs fileutils target-newlib target-libgloss"
|
||||
;;
|
||||
alpha*-*-*vms*)
|
||||
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"
|
||||
noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss target-libffi"
|
||||
;;
|
||||
alpha*-*-*)
|
||||
# newlib is not 64 bit ready
|
||||
@@ -577,20 +592,20 @@ case "${target}" in
|
||||
sh*-*-pe|mips*-*-pe|*arm-wince-pe)
|
||||
noconfigdirs="$noconfigdirs target-libjava target-libffi target-zlib"
|
||||
noconfigdirs="$noconfigdirs target-boehm-gc target-qthreads target-examples"
|
||||
noconfigdirs="$noconfigdirs target-librx target-libiberty texinfo send-pr"
|
||||
noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr"
|
||||
noconfigdirs="$noconfigdirs tcl tix tk itcl libgui sim"
|
||||
noconfigdirs="$noconfigdirs expect dejagnu"
|
||||
# the C++ libraries don't build on top of CE's C libraries
|
||||
noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio"
|
||||
noconfigdirs="$noconfigdirs ${libstdcxx_version}"
|
||||
skipdirs="$skipdirs target-newlib"
|
||||
case "${host}" in
|
||||
*-*-cygwin*) ;; # keep gdb and readline
|
||||
*) noconfigdirs="$noconfigdirs gdb readline target-libio target-libstdc++ target-libg++"
|
||||
*) noconfigdirs="$noconfigdirs gdb readline ${libstdcxx_version}"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
arc-*-*)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
arm-*-pe*)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
@@ -608,43 +623,43 @@ case "${target}" in
|
||||
fi
|
||||
;;
|
||||
arm-*-oabi*)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
c4x-*-*)
|
||||
noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx target-libgloss"
|
||||
noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
|
||||
;;
|
||||
c54x*-*-* | tic54x-*-*)
|
||||
noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx target-libgloss gcc gdb newlib"
|
||||
noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi gcc gdb newlib"
|
||||
;;
|
||||
thumb-*-coff)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
thumb-*-elf)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
thumb-*-oabi)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
strongarm-*-elf)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
if [ x${is_cross_compiler} != xno ] ; then
|
||||
target_configdirs="${target_configdirs} target-bsp target-cygmon"
|
||||
fi
|
||||
;;
|
||||
strongarm-*-coff)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
if [ x${is_cross_compiler} != xno ] ; then
|
||||
target_configdirs="${target_configdirs} target-bsp target-cygmon"
|
||||
fi
|
||||
;;
|
||||
thumb-*-pe)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
arm-*-riscix*)
|
||||
noconfigdirs="$noconfigdirs ld target-libgloss"
|
||||
noconfigdirs="$noconfigdirs ld target-libgloss target-libffi"
|
||||
;;
|
||||
d10v-*-*)
|
||||
noconfigdirs="$noconfigdirs target-librx target-libg++ target-libstdc++ target-libio"
|
||||
noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
|
||||
;;
|
||||
d30v-*-*)
|
||||
;;
|
||||
@@ -655,13 +670,13 @@ case "${target}" in
|
||||
;;
|
||||
h8300*-*-* | \
|
||||
h8500-*-*)
|
||||
noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx target-libgloss"
|
||||
noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
|
||||
;;
|
||||
hppa*-*-*elf* | \
|
||||
hppa*-*-linux-gnu* | \
|
||||
hppa*-*-lites* | \
|
||||
hppa*64*-*-*)
|
||||
# Do configure ld/binutils/gas for the above cases.
|
||||
# Do configure ld/binutils/gas for this case.
|
||||
;;
|
||||
hppa*-*-*)
|
||||
# HP's C compiler doesn't handle Emacs correctly (but on BSD and Mach
|
||||
@@ -684,11 +699,11 @@ case "${target}" in
|
||||
;;
|
||||
i[3456]86-*-go32* | i[3456]-*-msdosdjgpp*)
|
||||
# but don't build gdb
|
||||
noconfigdirs="$noconfigdirs gdb target-libg++ target-libstdc++ target-libio target-librx"
|
||||
noconfigdirs="$noconfigdirs gdb ${libstdcxx_version} target-libffi"
|
||||
;;
|
||||
i[3456]86-*-mingw32*)
|
||||
target_configdirs="$target_configdirs target-mingw"
|
||||
noconfigdirs="$noconfigdirs expect target-libgloss"
|
||||
noconfigdirs="$noconfigdirs expect target-libgloss target-libffi"
|
||||
|
||||
# Can't build gdb for mingw32 if not native.
|
||||
case "${host}" in
|
||||
@@ -699,7 +714,7 @@ case "${target}" in
|
||||
;;
|
||||
*-*-cygwin*)
|
||||
target_configdirs="$target_configdirs target-libtermcap target-winsup"
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-gperf target-libgloss target-libffi"
|
||||
# always build newlib.
|
||||
skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
|
||||
|
||||
@@ -711,15 +726,15 @@ case "${target}" in
|
||||
esac
|
||||
;;
|
||||
i[3456]86-*-pe)
|
||||
noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx target-libgloss"
|
||||
noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
|
||||
;;
|
||||
i[3456]86-*-sco3.2v5*)
|
||||
# The linker does not yet know about weak symbols in COFF,
|
||||
# and is not configured to handle mixed ELF and COFF.
|
||||
noconfigdirs="$noconfigdirs ld target-libgloss"
|
||||
noconfigdirs="$noconfigdirs ld target-libgloss target-libffi"
|
||||
;;
|
||||
i[3456]86-*-sco*)
|
||||
noconfigdirs="$noconfigdirs gprof target-libgloss"
|
||||
noconfigdirs="$noconfigdirs gprof target-libgloss target-libffi"
|
||||
;;
|
||||
i[3456]86-*-solaris2*)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
@@ -731,7 +746,7 @@ case "${target}" in
|
||||
*) ;;
|
||||
esac
|
||||
# but that's okay since emacs doesn't work anyway
|
||||
noconfigdirs="$noconfigdirs emacs emacs19 target-libgloss"
|
||||
noconfigdirs="$noconfigdirs emacs emacs19 target-libgloss target-libffi"
|
||||
;;
|
||||
i[3456]86-*-beos*)
|
||||
noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
|
||||
@@ -747,13 +762,13 @@ case "${target}" in
|
||||
fi
|
||||
;;
|
||||
mn10200-*-*)
|
||||
noconfigdirs="$noconfigdirs"
|
||||
noconfigdirs="$noconfigdirs target-libffi"
|
||||
if [ x${is_cross_compiler} != xno ] ; then
|
||||
target_configdirs="${target_configdirs} target-libstub target-cygmon"
|
||||
fi
|
||||
;;
|
||||
mn10300-*-*)
|
||||
noconfigdirs="$noconfigdirs"
|
||||
noconfigdirs="$noconfigdirs target-libffi"
|
||||
if [ x${is_cross_compiler} != xno ] ; then
|
||||
target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
|
||||
fi
|
||||
@@ -764,18 +779,21 @@ case "${target}" in
|
||||
# GNU ld is known to be broken for AIX 4.2 and 4.3 (at least)
|
||||
# The symptom is that GDBtk 4.18 fails at startup with a segfault
|
||||
# if linked by GNU ld, but not if linked by the native ld.
|
||||
noconfigdirs="$noconfigdirs gprof cvssrc target-libgloss ld"
|
||||
noconfigdirs="$noconfigdirs gprof cvssrc target-libgloss target-libffi ld"
|
||||
use_gnu_ld=no
|
||||
;;
|
||||
powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
|
||||
target_configdirs="$target_configdirs target-winsup"
|
||||
noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix db snavigator gnuserv"
|
||||
noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix db snavigator gnuserv target-libffi"
|
||||
# always build newlib.
|
||||
skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
|
||||
;;
|
||||
# This is temporary until we can link against shared libraries
|
||||
powerpcle-*-solaris*)
|
||||
noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl tix db snavigator gnuserv"
|
||||
noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl tix db snavigator gnuserv target-libffi"
|
||||
;;
|
||||
powerpc-*-beos*)
|
||||
noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
|
||||
;;
|
||||
powerpc-*-eabi)
|
||||
if [ x${is_cross_compiler} != xno ] ; then
|
||||
@@ -784,22 +802,21 @@ case "${target}" in
|
||||
;;
|
||||
rs6000-*-lynxos*)
|
||||
# The CVS server code doesn't work on the RS/6000
|
||||
# Newlib makes problems for libg++ in crosses.
|
||||
noconfigdirs="$noconfigdirs target-newlib gprof cvssrc"
|
||||
noconfigdirs="$noconfigdirs target-newlib gprof cvssrc target-libffi"
|
||||
;;
|
||||
rs6000-*-aix*)
|
||||
# The configure and build of ld are currently disabled because
|
||||
# GNU ld is known to be broken for AIX 4.2 and 4.3 (at least)
|
||||
# The symptom is that GDBtk 4.18 fails at startup with a segfault
|
||||
# if linked by GNU ld, but not if linked by the native ld.
|
||||
noconfigdirs="$noconfigdirs gprof ld"
|
||||
noconfigdirs="$noconfigdirs gprof target-libffi ld"
|
||||
use_gnu_ld=no
|
||||
;;
|
||||
rs6000-*-*)
|
||||
noconfigdirs="$noconfigdirs gprof"
|
||||
noconfigdirs="$noconfigdirs gprof target-libffi"
|
||||
;;
|
||||
m68k-apollo-*)
|
||||
noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss"
|
||||
noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss target-libffi"
|
||||
;;
|
||||
mips*-*-irix5*)
|
||||
# The GNU linker does not support shared libraries.
|
||||
@@ -811,26 +828,21 @@ case "${target}" in
|
||||
# emacs is emacs 18, which does not work on Irix 5 (emacs19 does work)
|
||||
noconfigdirs="$noconfigdirs gas gprof emacs target-libgloss"
|
||||
;;
|
||||
mips*-*-linux*)
|
||||
noconfigdirs="$noconfigdirs gprof"
|
||||
# linux has rx in libc
|
||||
skipdirs="$skipdirs target-librx"
|
||||
;;
|
||||
mips*-dec-bsd*)
|
||||
noconfigdirs="$noconfigdirs gprof target-libgloss"
|
||||
noconfigdirs="$noconfigdirs gprof target-libgloss target-libffi"
|
||||
;;
|
||||
mips*-*-bsd*)
|
||||
noconfigdirs="$noconfigdirs gprof target-libgloss"
|
||||
noconfigdirs="$noconfigdirs gprof target-libgloss target-libffi"
|
||||
;;
|
||||
mipstx39-*-*)
|
||||
noconfigdirs="$noconfigdirs gprof" # same as generic mips
|
||||
noconfigdirs="$noconfigdirs gprof target-libffi" # same as generic mips
|
||||
target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
|
||||
;;
|
||||
mips*-*-*)
|
||||
noconfigdirs="$noconfigdirs gprof"
|
||||
noconfigdirs="$noconfigdirs gprof target-libffi"
|
||||
;;
|
||||
romp-*-*)
|
||||
noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss"
|
||||
noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss target-libffi"
|
||||
;;
|
||||
sh-*-*)
|
||||
case "${host}" in
|
||||
@@ -839,7 +851,7 @@ case "${target}" in
|
||||
i[3456]86-*-msdosdjgpp*) ;; # don't add gprof back in
|
||||
*) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
|
||||
esac
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
sparc-*-elf*)
|
||||
if [ x${is_cross_compiler} != xno ] ; then
|
||||
@@ -850,11 +862,13 @@ case "${target}" in
|
||||
if [ x${is_cross_compiler} != xno ] ; then
|
||||
target_configdirs="${target_configdirs} target-libstub target-cygmon"
|
||||
fi
|
||||
noconfigdirs="target-libffi"
|
||||
;;
|
||||
sparclite-*-*)
|
||||
if [ x${is_cross_compiler} != xno ] ; then
|
||||
target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
|
||||
fi
|
||||
noconfigdirs="target-libffi"
|
||||
;;
|
||||
sparc-*-sunos4*)
|
||||
if [ x${is_cross_compiler} != xno ] ; then
|
||||
@@ -864,35 +878,31 @@ case "${target}" in
|
||||
fi
|
||||
;;
|
||||
v810-*-*)
|
||||
noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libio target-libg++ target-libstdc++ opcodes target-libgloss"
|
||||
noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld ${libstdcxx_version} opcodes target-libgloss target-libffi"
|
||||
;;
|
||||
v850-*-*)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
v850e-*-*)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
v850ea-*-*)
|
||||
noconfigdirs="$noconfigdirs target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-libgloss target-libffi"
|
||||
;;
|
||||
vax-*-vms)
|
||||
noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss"
|
||||
noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss target-libffi"
|
||||
;;
|
||||
vax-*-*)
|
||||
noconfigdirs="$noconfigdirs target-newlib target-libgloss"
|
||||
;;
|
||||
*-*-linux*)
|
||||
# linux has rx in libc
|
||||
skipdirs="$skipdirs target-librx"
|
||||
noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libffi"
|
||||
;;
|
||||
*-*-lynxos*)
|
||||
# Newlib makes problems for libg++ in crosses.
|
||||
noconfigdirs="$noconfigdirs target-newlib target-libgloss"
|
||||
noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libffi"
|
||||
;;
|
||||
*-*-macos* | \
|
||||
*-*-mpw*)
|
||||
# Macs want a resource compiler.
|
||||
configdirs="$configdirs grez"
|
||||
noconfigdirs="target-libffi"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1176,7 +1186,7 @@ fi
|
||||
|
||||
# provide a proper gxx_include_dir.
|
||||
# Note, if you change the default, make sure to fix both here and in
|
||||
# the gcc, libio, libstdc++ and libg++ subdirectories.
|
||||
# the gcc, libio, and libstdc++ subdirectories.
|
||||
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
|
||||
gxx_include_dir=
|
||||
if test -n "${with_gxx_include_dir}"; then
|
||||
|
||||
Reference in New Issue
Block a user