X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fconfigure.ac;h=41a51bbb7e95f78ef09092808a6ca857af48e4b1;hb=ed48ec2e6ec5514f01b9b3a810d6ddf39651114b;hp=9bada13208928cf38561617d88e49ff57a8cd1f8;hpb=fe22cbc418b35ed6ea3252a204bd351f8c201e0b;p=deliverable%2Fbinutils-gdb.git
diff --git a/ld/configure.ac b/ld/configure.ac
index 9bada13208..41a51bbb7e 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script
dnl
-dnl Copyright (C) 2012-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2019 Free Software Foundation, Inc.
dnl
dnl This file is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@ dnl along with this program; see the file COPYING3. If not see
dnl .
dnl
-AC_PREREQ(2.59)
m4_include([../bfd/version.m4])
AC_INIT([ld], BFD_VERSION)
AC_CONFIG_SRCDIR(ldmain.c)
@@ -44,7 +43,7 @@ AC_ARG_ENABLE(targets,
[ --enable-targets alternative target configurations],
[case "${enableval}" in
yes | "") AC_MSG_ERROR(enable-targets option must specify target names or 'all')
- ;;
+ ;;
no) enable_targets= ;;
*) enable_targets=$enableval ;;
esac])dnl
@@ -120,7 +119,7 @@ AC_SUBST(installed_linker)
AC_ARG_ENABLE([got],
AS_HELP_STRING([--enable-got=],
- [GOT handling scheme (target, single, negative, multigot)]),
+ [GOT handling scheme (target, single, negative, multigot)]),
[case "${enableval}" in
target | single | negative | multigot) got_handling=$enableval ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-got option) ;;
@@ -130,16 +129,16 @@ esac],
case "${got_handling}" in
target)
AC_DEFINE([GOT_HANDLING_DEFAULT], [GOT_HANDLING_TARGET_DEFAULT],
- [Define to choose default GOT handling scheme]) ;;
+ [Define to choose default GOT handling scheme]) ;;
single)
AC_DEFINE([GOT_HANDLING_DEFAULT], [GOT_HANDLING_SINGLE],
- [Define to choose default GOT handling scheme]) ;;
+ [Define to choose default GOT handling scheme]) ;;
negative)
AC_DEFINE([GOT_HANDLING_DEFAULT], [GOT_HANDLING_NEGATIVE],
- [Define to choose default GOT handling scheme]) ;;
+ [Define to choose default GOT handling scheme]) ;;
multigot)
AC_DEFINE([GOT_HANDLING_DEFAULT], [GOT_HANDLING_MULTIGOT],
- [Define to choose default GOT handling scheme]) ;;
+ [Define to choose default GOT handling scheme]) ;;
*) AC_MSG_ERROR(bad value ${got_handling} for --enable-got option) ;;
esac
@@ -177,6 +176,16 @@ AC_ARG_ENABLE(relro,
no) ac_default_ld_z_relro=0 ;;
esac])dnl
+# Decide if -z separate-code should be enabled in ELF linker by default.
+ac_default_ld_z_separate_code=unset
+AC_ARG_ENABLE(separate-code,
+ AS_HELP_STRING([--enable-separate-code],
+ [enable -z separate-code in ELF linker by default]),
+[case "${enableval}" in
+ yes) ac_default_ld_z_separate_code=1 ;;
+ no) ac_default_ld_z_separate_code=0 ;;
+esac])
+
# Decide which "--hash-style" to use by default
# Provide a configure time option to override our default.
AC_ARG_ENABLE([default-hash-style],
@@ -227,7 +236,7 @@ fi
# host-specific stuff:
-ALL_LINGUAS="bg da de es fi fr ga id it ru sr sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="bg da de es fi fr ga id it ja pt_BR ru sr sv tr uk vi zh_CN zh_TW"
ZW_GNU_GETTEXT_SISTER_DIR
AM_PO_SUBDIRS
@@ -310,12 +319,7 @@ EMUL=
all_emuls=
all_emul_extras=
all_libpath=
-
-dnl We need to get an arbitrary number of tdir definitions into
-dnl Makefile. We can't do it using AC_SUBST, because autoconf does
-dnl not permit literal newlines in an AC_SUBST variables. So we use a
-dnl file.
-rm -f tdirs
+TDIRS=
# If the host is 64-bit, then we enable 64-bit targets by default.
# This is consistent with what ../bfd/configure.ac does.
@@ -367,19 +371,24 @@ do
all_emuls="$all_emuls e${i}.o"
eval result=\$tdir_$i
test -z "$result" && result=$targ_alias
- echo tdir_$i=$result >> tdirs
+ TDIRS="$TDIRS
+tdir_$i=$result"
case "${i}" in
*elf*)
elf_list_options=TRUE
;;
*)
- if $GREP "TEMPLATE_NAME=elf32" ${srcdir}/emulparams/${i}.sh >/dev/null 2>/dev/null; then
+ if $GREP "TEMPLATE_NAME=elf" ${srcdir}/emulparams/${i}.sh >/dev/null 2>/dev/null; then
elf_list_options=TRUE
fi
;;
esac
if test "$elf_list_options" = "TRUE"; then
- . ${srcdir}/emulparams/${i}.sh
+ source_sh()
+ {
+ . $1
+ }
+ source_sh ${srcdir}/emulparams/${i}.sh
if test x${GENERATE_SHLIB_SCRIPT} = xyes; then
elf_shlib_list_options=TRUE
fi
@@ -434,6 +443,13 @@ AC_DEFINE_UNQUOTED(DEFAULT_LD_Z_RELRO,
$ac_default_ld_z_relro,
[Define to 1 if you want to enable -z relro in ELF linker by default.])
+if test "${ac_default_ld_z_separate_code}" = unset; then
+ ac_default_ld_z_separate_code=0
+fi
+AC_DEFINE_UNQUOTED(DEFAULT_LD_Z_SEPARATE_CODE,
+ $ac_default_ld_z_separate_code,
+ [Define to 1 if you want to enable -z separate-code in ELF linker by default.])
+
AC_DEFINE_UNQUOTED([DEFAULT_EMIT_SYSV_HASH],
[$ac_default_emit_sysv_hash],
[Define to 1 if you want to emit sysv hash in the ELF linker by default.])
@@ -447,8 +463,8 @@ AC_SUBST(elf_shlib_list_options)
AC_SUBST(elf_plt_unwind_list_options)
AC_SUBST(EMUL)
-TDIRS=tdirs
-AC_SUBST_FILE(TDIRS)
+AC_SUBST(TDIRS)
+AM_SUBST_NOTMAKE(TDIRS)
if test x${all_targets} = xtrue; then
if test x${want64} = xtrue; then
@@ -470,7 +486,7 @@ EMULATION_LIBPATH=$all_libpath
AC_SUBST(EMULATION_LIBPATH)
if test x${enable_static} = xno; then
- TESTBFDLIB="-Wl,--rpath ../bfd/.libs ../bfd/.libs/libbfd.so"
+ TESTBFDLIB="-Wl,--rpath,../bfd/.libs ../bfd/.libs/libbfd.so"
else
TESTBFDLIB="../bfd/.libs/libbfd.a"
fi
@@ -491,6 +507,26 @@ if test x${EXTRA_SHLIB_EXTENSION} != x ; then
[Additional extension a shared object might have.])
fi
+AC_CONFIG_COMMANDS([default],
+[[
+case "$srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+esac
+POFILES=
+GMOFILES=
+for lang in dummy $OBSOLETE_ALL_LINGUAS; do
+ if test $lang != dummy; then
+ POFILES="$POFILES $srcdirpre$lang.po"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ fi
+done
+sed -e '/^SRC-POTFILES =/r po/SRC-POTFILES' \
+ -e '/^BLD-POTFILES =/r po/BLD-POTFILES' \
+ -e "s,@POFILES@,$POFILES," \
+ -e "s,@GMOFILES@,$GMOFILES," \
+ po/Makefile.in > po/Makefile]],[[]])
+
dnl Required by html, pdf, install-pdf and install-html
AC_SUBST(datarootdir)
AC_SUBST(docdir)