diff options
| author | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-07 10:26:48 +0000 |
|---|---|---|
| committer | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-07 10:26:48 +0000 |
| commit | 7af7b1a41863a113580a015863e473e853d77520 (patch) | |
| tree | 9b73d9351bcf9dcbf700c433166d3c55fd04af80 /lto-plugin | |
| parent | 3a9d8500bea35d8fde4c8ac5948ea8e42426de64 (diff) | |
revert r169877 patch for PR47225
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169878 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'lto-plugin')
| -rw-r--r-- | lto-plugin/ChangeLog | 11 | ||||
| -rw-r--r-- | lto-plugin/Makefile.am | 4 | ||||
| -rw-r--r-- | lto-plugin/Makefile.in | 7 |
3 files changed, 14 insertions, 8 deletions
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index 1fae1365787..014634520ae 100644 --- 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 1e4405389cf..a51bc4a9739 100644 --- 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 f1595f7aa2f..2e283f7a0eb 100644 --- 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) \ |