projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use bfd_get_* macro to set bfd fields
[deliverable/binutils-gdb.git]
/
ld
/
configure.ac
diff --git
a/ld/configure.ac
b/ld/configure.ac
index b14411ef90ede5df789724e157e73c620151ad14..41a51bbb7e95f78ef09092808a6ca857af48e4b1 100644
(file)
--- 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 Process this file with autoconf to produce a configure script
dnl
-dnl Copyright (C) 2012-201
8
Free Software Foundation, Inc.
+dnl Copyright (C) 2012-201
9
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
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 <http://www.gnu.org/licenses/>.
dnl
dnl <http://www.gnu.org/licenses/>.
dnl
-AC_PREREQ(2.59)
m4_include([../bfd/version.m4])
AC_INIT([ld], BFD_VERSION)
AC_CONFIG_SRCDIR(ldmain.c)
m4_include([../bfd/version.m4])
AC_INIT([ld], BFD_VERSION)
AC_CONFIG_SRCDIR(ldmain.c)
@@
-320,12
+319,7
@@
EMUL=
all_emuls=
all_emul_extras=
all_libpath=
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.
# If the host is 64-bit, then we enable 64-bit targets by default.
# This is consistent with what ../bfd/configure.ac does.
@@
-377,19
+371,24
@@
do
all_emuls="$all_emuls e${i}.o"
eval result=\$tdir_$i
test -z "$result" && result=$targ_alias
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
;;
*)
case "${i}" in
*elf*)
elf_list_options=TRUE
;;
*)
- if $GREP "TEMPLATE_NAME=elf
32
" ${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
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
if test x${GENERATE_SHLIB_SCRIPT} = xyes; then
elf_shlib_list_options=TRUE
fi
@@
-464,8
+463,8
@@
AC_SUBST(elf_shlib_list_options)
AC_SUBST(elf_plt_unwind_list_options)
AC_SUBST(EMUL)
AC_SUBST(elf_plt_unwind_list_options)
AC_SUBST(EMUL)
-TDIRS=tdirs
-A
C_SUBST_FIL
E(TDIRS)
+AC_SUBST(TDIRS)
+A
M_SUBST_NOTMAK
E(TDIRS)
if test x${all_targets} = xtrue; then
if test x${want64} = xtrue; then
if test x${all_targets} = xtrue; then
if test x${want64} = xtrue; then
This page took
0.023606 seconds
and
4
git commands to generate.