configure.ac - Issue 11969036: Merge GDB 7.5.1

Unified Diff: configure.ac

Issue 11969036: Merge GDB 7.5.1 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@master

Patch Set: Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: configure.ac

diff --git a/configure.ac b/configure.ac

index 9ef2e3576fb732a31187aa0511c32ee46bcc3f18..d68b5f3fce90b3592139d3d6523af7b584dc5ee8 100644

--- a/configure.ac

+++ b/configure.ac

@@ -1,5 +1,5 @@

-# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011

+# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012

# Free Software Foundation, Inc.

# This file is free software; you can redistribute it and/or modify it

@@ -112,11 +112,11 @@ extra_host_args=

### or a host dependent tool. Then put it into the appropriate list

### (library or tools, host or target), doing a dependency sort.

-# Subdirs will be configured in the order listed in build_configdirs,

+# Subdirs will be configured in the order listed in build_configdirs,

# configdirs, or target_configdirs; see the serialization section below.

-# Dependency sorting is only needed when *configuration* must be done in

-# a particular order. In all cases a dependency should be specified in

+# Dependency sorting is only needed when *configuration* must be done in

+# a particular order. In all cases a dependency should be specified in

# the Makefile, whether or not it's implicitly specified here.

# Double entries in build_configdirs, configdirs, or target_configdirs may

@@ -209,7 +209,7 @@ if test x"${host}" = x"${target}" ; then

is_cross_compiler=no

else

is_cross_compiler=yes

-fi

+fi

# Find the build and target subdir names.

GCC_TOPLEV_SUBDIRS

@@ -245,7 +245,7 @@ if test x$with_system_zlib = xyes ; then

noconfigdirs="$noconfigdirs zlib"

-# some tools are so dependent upon X11 that if we're not building with X,

+# 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

@@ -253,7 +253,7 @@ case ${with_x} in

no)

skipdirs="${skipdirs} tk itcl libgui"

# We won't be able to build gdbtk without X.

- enable_gdbtk=no

+ enable_gdbtk=no

;;

*) echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;;

esac

@@ -313,7 +313,7 @@ case "${ENABLE_GOLD}" in

*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \

| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \

| *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \

- | *-*-solaris2* | *-*-nto*)

+ | *-*-solaris2* | *-*-nto* | *-*-nacl*)

case "${target}" in

*-*-linux*aout* | *-*-linux*oldld*)

;;

@@ -379,7 +379,7 @@ esac

# Only spaces may be used in this macro; not newlines or tabs.

unsupported_languages=

-# 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

# exist yet.

@@ -483,7 +483,7 @@ if test x$enable_libgomp = x ; then

;;

*-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)

;;

- *-*-solaris2* | *-*-irix6* | *-*-osf* | *-*-hpux11*)

+ *-*-solaris2* | *-*-hpux11*)

;;

*-*-darwin* | *-*-aix*)

;;

@@ -519,7 +519,9 @@ case "${target}" in

noconfigdirs="$noconfigdirs target-libssp"

;;

rl78-*-*)

- # Dereferencing -1 is a compile-time error

+ # libssp uses a misaligned load to trigger a fault, but the RL78

+ # doesn't fault for those - instead, it gives a build-time error

+ # for explicit misaligned loads.

noconfigdirs="$noconfigdirs target-libssp"

;;

esac

@@ -569,7 +571,7 @@ case "${target}" in

;;

m68k-*-*)

;;

- mips-sgi-irix6.* | mips*-*-rtems*)

+ mips*-*-rtems*)

;;

mips*-*-linux*)

;;

@@ -685,16 +687,9 @@ case "${target}" in

rs6000-*-aix*)

noconfigdirs="$noconfigdirs ${libgcj}"

;;

- mips*-*-irix6*)

- # Linking libjava exceeds command-line length limits on at least

- # IRIX 6.2, but not on IRIX 6.5.

- # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham

- # <oldham@codesourcery.com>

- noconfigdirs="$noconfigdirs ${libgcj}"

- ;;

*-*-lynxos*)

noconfigdirs="$noconfigdirs ${libgcj}"

- ;;

+ ;;

esac

# Default libgloss CPU subdirectory.

@@ -779,7 +774,7 @@ case "${target}" in

;;

*-*-lynxos*)

noconfigdirs="$noconfigdirs target-newlib target-libgloss"

- ;;

+ ;;

*-*-mingw*)

noconfigdirs="$noconfigdirs target-newlib target-libgloss"

;;

@@ -929,8 +924,7 @@ case "${target}" in

noconfigdirs="$noconfigdirs libgui itcl ld"

;;

ia64*-*-*vms*)

- # No gdb or ld support yet.

- noconfigdirs="$noconfigdirs readline libgui itcl gdb ld"

+ noconfigdirs="$noconfigdirs libgui itcl"

;;

i[[3456789]]86-w64-mingw*)

;;

@@ -1084,7 +1078,7 @@ case "${host}" in

hppa*-hp-hpux*)

host_makefile_frag="config/mh-pa"

;;

- hppa*-*)

+ hppa*-*)

host_makefile_frag="config/mh-pa"

;;

*-*-darwin*)

@@ -1283,9 +1277,16 @@ if test "x$with_mpfr_lib" != x; then

gmplibs="-L$with_mpfr_lib $gmplibs"

if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then

- gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"

- gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"

- extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"

+ # MPFR v3.1.0 moved the sources into a src sub-directory.

+ if test -d ${srcdir}/mpfr/src; then

+ gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs"

+ gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc"

+ extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir"

+ else

+ gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"

+ gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"

+ extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"

+ fi

# Do not test the mpfr version. Assume that it is sufficient, since

# it is in the source tree, and the library has not been built yet

# but it would be included on the link line in the version check below

@@ -1780,7 +1781,7 @@ if test -d ${srcdir}/gcc; then

# an apparent bug in bash 1.12 on linux.

${srcdir}/gcc/[[*]]/config-lang.in) ;;

- # From the config-lang.in, get $language, $target_libs,

+ # From the config-lang.in, get $language, $target_libs,

# $lang_dirs, $boot_language, and $build_by_default

language=

target_libs=

@@ -2025,7 +2026,7 @@ done

build_configdirs_all="$build_configdirs"

build_configdirs=

for i in ${build_configdirs_all} ; do

- j=`echo $i | sed -e s/build-//g`

+ j=`echo $i | sed -e s/build-//g`

if test -f ${srcdir}/$j/configure ; then

build_configdirs="${build_configdirs} $i"

@@ -2042,7 +2043,7 @@ done

target_configdirs_all="$target_configdirs"

target_configdirs=

for i in ${target_configdirs_all} ; do

- j=`echo $i | sed -e s/target-//g`

+ j=`echo $i | sed -e s/target-//g`

if test -f ${srcdir}/$j/configure ; then

target_configdirs="${target_configdirs} $i"

@@ -2093,7 +2094,7 @@ ACX_TOOL_DIRS

copy_dirs=

-AC_ARG_WITH([build-sysroot],

+AC_ARG_WITH([build-sysroot],

[AS_HELP_STRING([--with-build-sysroot=SYSROOT],

[use sysroot as the system root during the build])],

[if test x"$withval" != x ; then

@@ -2124,11 +2125,11 @@ if test "x$CFLAGS_FOR_TARGET" = x; then

CFLAGS_FOR_TARGET=$CFLAGS

case " $CFLAGS " in

*" -O2 "*) ;;

- *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;

+ *) CFLAGS_FOR_TARGET="-O2 $CFLAGS_FOR_TARGET" ;;

esac

case " $CFLAGS " in

*" -g "* | *" -g3 "*) ;;

- *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;

+ *) CFLAGS_FOR_TARGET="-g $CFLAGS_FOR_TARGET" ;;

esac

AC_SUBST(CFLAGS_FOR_TARGET)

@@ -2137,11 +2138,11 @@ if test "x$CXXFLAGS_FOR_TARGET" = x; then

CXXFLAGS_FOR_TARGET=$CXXFLAGS

case " $CXXFLAGS " in

*" -O2 "*) ;;

- *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;

+ *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS_FOR_TARGET" ;;

esac

case " $CXXFLAGS " in

*" -g "* | *" -g3 "*) ;;

- *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;

+ *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS_FOR_TARGET" ;;

esac

AC_SUBST(CXXFLAGS_FOR_TARGET)

@@ -2184,11 +2185,11 @@ fi

# This is done by determining whether or not the appropriate directory

# is available, and by checking whether or not specific configurations

# have requested that this magic not happen.

-# The command line options always override the explicit settings in

+# The command line options always override the explicit settings in

# configure.in, and the settings in configure.in override this magic.

-# If the default for a toolchain is to use GNU as and ld, and you don't

+# If the default for a toolchain is to use GNU as and ld, and you don't

# want to do that, then you should use the --without-gnu-as and

# --without-gnu-ld options for the configure script. Similarly, if

# the default is to use the included zlib and you don't want to do that,

@@ -2289,7 +2290,7 @@ case "${target}" in

target_makefile_frag="config/mt-gnu"

;;

*-*-aix4.[[3456789]]* | *-*-aix[[56789]].*)

- # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm

+ # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm

# commands to handle both 32-bit and 64-bit objects. These flags are

# harmless if we're using GNU nm or ar.

extra_arflags_for_target=" -X32_64"

@@ -2331,18 +2332,6 @@ case "${enable_target_optspace}:${target}" in

;;

esac

-# Default to using --with-stabs for certain targets.

-if test x${with_stabs} = x ; then

- case "${target}" in

- mips*-*-irix[[56]]*)

- ;;

- mips*-*-* | alpha*-*-osf*)

- with_stabs=yes;

- extra_host_args="${extra_host_args} --with-stabs"

- ;;

- esac

-fi

# Some systems (e.g., one of the i386-aix systems the gas testers are

# using) don't handle "\$" correctly, so don't use it here.

tooldir='${exec_prefix}'/${target_noncanonical}

@@ -2375,7 +2364,7 @@ if test $? = 0 ; then

if test -s conftest || test -s conftest.exe ; then

we_are_ok=yes

-fi

+fi

case $we_are_ok in

no)

echo 1>&2 "*** The command '${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c' failed."

@@ -2745,7 +2734,7 @@ baseargs=`echo "x$baseargs" | sed -e 's/^x *//' -e 's,\\$,$$,g'`

# --program-suffix have been applied to it. Autoconf has already

# doubled dollar signs and backslashes in program_transform_name; we want

# the backslashes un-doubled, and then the entire thing wrapped in single

-# quotes, because this will be expanded first by make and then by the shell.

+# quotes, because this will be expanded first by make and then by the shell.

# Also, because we want to override the logic in subdir configure scripts to

# choose program_transform_name, replace any s,x,x, with s,y,y,.

sed -e "s,\\\\\\\\,\\\\,g; s,','\\\\'',g; s/s,x,x,/s,y,y,/" <<EOF_SED > conftestsed.out

@@ -3070,7 +3059,7 @@ AC_SUBST(CFLAGS)

AC_SUBST(CXXFLAGS)

# Target tools.

-AC_ARG_WITH([build-time-tools],

+AC_ARG_WITH([build-time-tools],

[AS_HELP_STRING([--with-build-time-tools=PATH],

[use given path to find target tools during the build])],

[case x"$withval" in

@@ -3175,7 +3164,7 @@ if test "$USE_MAINTAINER_MODE" = yes; then

else

MAINTAINER_MODE_TRUE='#'

MAINTAINER_MODE_FALSE=

-fi

+fi

MAINT=$MAINTAINER_MODE_TRUE

AC_SUBST(MAINT)dnl

« no previous file with comments | « configure ('k') | cpu/ChangeLog » ('j') | no next file with comments »