revert r169877 patch for PR47225

From-SVN: r169878

diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog
index 1fae1365787fe2c8cfa726658e8d374e5817e910..014634520aeb8c85890f52f20e3067ef0c64e141 100644 (file)
--- a/lto-plugin/ChangeLog
+++ b/lto-plugin/ChangeLog
@@ -1,3 +1,14 @@
+2011-02-07  Paolo Bonzini  <bonzini@gnu.org>
+
+       Revert:
+
+       2011-02-07  Kai Tietz  <kai.tietz@onevision.com>
+
+       PR lto/47225
+       * Makefile.am (Wl): New helper for encoding -Wl,.
+       (liblto_plugin_la_LIBADD): Use -Wl for libiberty library.
+       * Makefile.in: Regenerated.
+
 2011-02-07  Kai Tietz  <kai.tietz@onevision.com>
 
        PR lto/47225

diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am
index 1e4405389cf7a551fdecc5dab526876398b782ec..a51bc4a9739edcfdfecb7143a1a68812c68e5a72 100644 (file)
--- a/lto-plugin/Makefile.am
+++ b/lto-plugin/Makefile.am
@@ -11,13 +11,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
 AM_CFLAGS = -Wall -Werror
 AM_LIBTOOLFLAGS = --tag=disable-static
 
-# This can go away when libiberty becomes a normal convenience library
-Wl=-Wl,
 libexecsub_LTLIBRARIES = liblto_plugin.la
 
 liblto_plugin_la_SOURCES = lto-plugin.c
 liblto_plugin_la_LIBADD = \
-       $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wl)../libiberty/pic/libiberty.a,)
+       $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
 # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
 liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \
        $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)

diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
index f1595f7aa2fee1b457d9791457f61b3aa9cb5ad7..2e283f7a0ebfeeb88a011eb01792deeab222f4c6 100644 (file)
--- a/lto-plugin/Makefile.in
+++ b/lto-plugin/Makefile.in
@@ -82,7 +82,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(libexecsubdir)"
 LTLIBRARIES = $(libexecsub_LTLIBRARIES)
 liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
-       ../libiberty/pic/libiberty.a),$(Wl)../libiberty/pic/libiberty.a,)
+       ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
 am_liblto_plugin_la_OBJECTS = lto-plugin.lo
 liblto_plugin_la_OBJECTS = $(am_liblto_plugin_la_OBJECTS)
 liblto_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -231,13 +231,10 @@ libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
 AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
 AM_CFLAGS = -Wall -Werror
 AM_LIBTOOLFLAGS = --tag=disable-static
-
-# This can go away when libiberty becomes a normal convenience library
-Wl = -Wl,
 libexecsub_LTLIBRARIES = liblto_plugin.la
 liblto_plugin_la_SOURCES = lto-plugin.c
 liblto_plugin_la_LIBADD = \
-       $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wl)../libiberty/pic/libiberty.a,)
+       $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
 
 # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
 liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \