diff options
Diffstat (limited to 'binutils-2.22/ld/configure.in')
-rw-r--r-- | binutils-2.22/ld/configure.in | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/binutils-2.22/ld/configure.in b/binutils-2.22/ld/configure.in index bd5040e..b844927 100644 --- a/binutils-2.22/ld/configure.in +++ b/binutils-2.22/ld/configure.in @@ -75,7 +75,7 @@ dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. AC_ARG_ENABLE(gold, [[ --enable-gold[=ARG] build gold [ARG={default,yes,no}]]], -[case "${enableval}" in +[case "${enableval}" in default) install_as_default=no installed_linker=ld.bfd @@ -120,8 +120,19 @@ esac AM_BINUTILS_WARNINGS +AM_LC_MESSAGES + AC_CONFIG_HEADERS([config.h:config.in]) +# PR 14072 +AH_VERBATIM([00_CONFIG_H_CHECK], +[/* Check that config.h is #included before system headers + (this works only for glibc, but that should be enough). */ +#if defined(__GLIBC__) && !defined(__CONFIG_H__) +# error config.h must be #included before system headers +#endif +#define __CONFIG_H__ 1]) + if test -z "$target" ; then AC_MSG_ERROR(Unrecognized target system type; please check config.sub.) fi @@ -140,7 +151,7 @@ AC_PROG_INSTALL LT_INIT -ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id bg" +ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id bg it" ZW_GNU_GETTEXT_SISTER_DIR AM_PO_SUBDIRS @@ -160,9 +171,10 @@ AC_SUBST(HOSTING_CRT0) AC_SUBST(HOSTING_LIBS) AC_SUBST(NATIVE_LIB_DIRS) -AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h elf-hints.h limits.h sys/param.h) +AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h elf-hints.h limits.h locale.h sys/param.h) AC_CHECK_HEADERS(fcntl.h sys/file.h sys/time.h sys/stat.h) -AC_CHECK_FUNCS(glob mkstemp realpath sbrk waitpid) +ACX_HEADER_STRING +AC_CHECK_FUNCS(glob mkstemp realpath sbrk setlocale waitpid) AC_CHECK_FUNCS(open lseek close) AC_HEADER_DIRENT @@ -210,14 +222,14 @@ if test $ld_cv_decl_getopt_unistd_h = yes; then AC_DEFINE([HAVE_DECL_GETOPT], 1, [Is the prototype for getopt in <unistd.h> in the expected format?]) fi - + BFD_BINARY_FOPEN AC_CHECK_DECLS([strstr, free, sbrk, getenv, environ]) # Link in zlib if we can. This is needed only for the bootstrap tests # right now, since those tests use libbfd, which depends on zlib. -AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)]) +AM_ZLIB # When converting linker scripts into strings for use in emulation # files, use astring.sed if the compiler supports ANSI string @@ -252,6 +264,15 @@ dnl not permit literal newlines in an AC_SUBST variables. So we use a dnl file. rm -f tdirs +# If the host is 64-bit, then we enable 64-bit targets by default. +# This is consistent with what ../bfd/configure.in does. +if test x${want64} = xfalse; then + AC_CHECK_SIZEOF(void *) + if test "x${ac_cv_sizeof_void_p}" = "x8"; then + want64=true + fi +fi + for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'` do if test "$targ_alias" = "all"; then @@ -322,12 +343,6 @@ TDIRS=tdirs AC_SUBST_FILE(TDIRS) if test x${all_targets} = xtrue; then - if test x${want64} = xfalse; then - AC_CHECK_SIZEOF(long) - if test "x${ac_cv_sizeof_long}" = "x8"; then - want64=true - fi - fi if test x${want64} = xtrue; then EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)' else |