aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Kwan <dougkwan@google.com>2011-05-09 17:56:47 +0000
committerDoug Kwan <dougkwan@google.com>2011-05-09 17:56:47 +0000
commit91c1f14cb61e83f86b103d25a4104efc064d2b3b (patch)
tree640fc753e8d7f11e16f1fa6eb6c181d37b899ade
parent31507b90dac2e8e9de00989defcabb1e3a45c992 (diff)
downloadfsf-binutils-gdb-91c1f14cb61e83f86b103d25a4104efc064d2b3b.zip
fsf-binutils-gdb-91c1f14cb61e83f86b103d25a4104efc064d2b3b.tar.gz
fsf-binutils-gdb-91c1f14cb61e83f86b103d25a4104efc064d2b3b.tar.bz2
2011-05-08 Doug Kwan <dougkwan@google.com>
Merge from gcc: 2011-05-08 Doug Kwan <dougkwan@google.com> * configure.ac: Propagate LDFLAGS_FOR_TARGET. * configure: Regenerated. * Makefile.tpl (LDFLAGS_FOR_TARGET): Use LDFLAGS_FOR_TARGET value from configure. * Makefile.in: Regenerated.
-rw-r--r--ChangeLog12
-rw-r--r--Makefile.in2
-rw-r--r--Makefile.tpl2
-rwxr-xr-xconfigure3
-rw-r--r--configure.ac2
5 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84903f5..028f718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-08 Doug Kwan <dougkwan@google.com>
+
+ Merge from gcc:
+
+ 2011-05-08 Doug Kwan <dougkwan@google.com>
+
+ * configure.ac: Propagate LDFLAGS_FOR_TARGET.
+ * configure: Regenerated.
+ * Makefile.tpl (LDFLAGS_FOR_TARGET): Use LDFLAGS_FOR_TARGET
+ value from configure.
+ * Makefile.in: Regenerated.
+
2011-05-05 Joseph Myers <joseph@codesourcery.com>
* configure.ac (alpha*-dec-osf*, i[[3456789]]86-*-rdos*,
diff --git a/Makefile.in b/Makefile.in
index 5cc0356..944839b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -541,7 +541,7 @@ CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-LDFLAGS_FOR_TARGET =
+LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
GOCFLAGS_FOR_TARGET = -O2 -g
FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
diff --git a/Makefile.tpl b/Makefile.tpl
index f7312d9..0b2b3d8 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -494,7 +494,7 @@ CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-LDFLAGS_FOR_TARGET =
+LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
GOCFLAGS_FOR_TARGET = -O2 -g
FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
diff --git a/configure b/configure
index cb341f9..30d6945 100755
--- a/configure
+++ b/configure
@@ -634,6 +634,7 @@ target_configargs
host_configargs
build_configargs
BUILD_CONFIG
+LDFLAGS_FOR_TARGET
CXXFLAGS_FOR_TARGET
CFLAGS_FOR_TARGET
DEBUG_PREFIX_CFLAGS_FOR_TARGET
@@ -6625,6 +6626,8 @@ if test "x$CXXFLAGS_FOR_TARGET" = x; then
fi
+
+
# Handle --with-headers=XXX. If the value is not "yes", the contents of
# the named directory are copied to $(tooldir)/sys-include.
if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
diff --git a/configure.ac b/configure.ac
index 0ac9030..3960694 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2110,6 +2110,8 @@ if test "x$CXXFLAGS_FOR_TARGET" = x; then
fi
AC_SUBST(CXXFLAGS_FOR_TARGET)
+AC_SUBST(LDFLAGS_FOR_TARGET)
+
# Handle --with-headers=XXX. If the value is not "yes", the contents of
# the named directory are copied to $(tooldir)/sys-include.
if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then