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.

diff --git a/ChangeLog b/ChangeLog
index 84903f5c265b81569b4f421d6c452d0421e89728..028f718002925a53e854792dd8b64791f988313c 100644 (file)
--- 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 5cc03562a076c3856a67c231ad5718b95f265663..944839b6b26384aa5f19b794dadb33b0e77cbd45 100644 (file)
--- 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 f7312d9e8cef9bece30627f50a397ddd4a367d1d..0b2b3d898929f38d58155d6097d3730e3ff793d1 100644 (file)
--- 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 cb341f95b1ecbd954c590d249cb7af075d4f04c6..30d694599d10ef5a1bcd9fdafeed26e01805e97d 100755 (executable)
--- 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 0ac903055abaef8e1fe28ba0cbf05c520ab4adb8..39606948e3d8a816f2aee728491dede43c9b0539 100644 (file)
--- 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