Skip to content

R
riscv-gcc-1
Commit e6d926d7 by Paolo Bonzini Committed by Paolo Bonzini
Options

revert r169877 patch for PR47225 

From-SVN: r169878
parent c7b5125d
Showing with 14 additions and 8 deletions
lto-plugin/ChangeLog
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> 2011-02-07 Kai Tietz <kai.tietz@onevision.com>
PR lto/47225 PR lto/47225
......
lto-plugin/Makefile.am
...@@ -11,13 +11,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) ...@@ -11,13 +11,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
AM_CFLAGS = -Wall -Werror AM_CFLAGS = -Wall -Werror
AM_LIBTOOLFLAGS = --tag=disable-static AM_LIBTOOLFLAGS = --tag=disable-static
# This can go away when libiberty becomes a normal convenience library
Wl=-Wl,
libexecsub_LTLIBRARIES = liblto_plugin.la libexecsub_LTLIBRARIES = liblto_plugin.la
liblto_plugin_la_SOURCES = lto-plugin.c liblto_plugin_la_SOURCES = lto-plugin.c
liblto_plugin_la_LIBADD = \ 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 # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \ liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \
$(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a) $(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)
......
lto-plugin/Makefile.in
...@@ -82,7 +82,7 @@ am__base_list = \ ...@@ -82,7 +82,7 @@ am__base_list = \
am__installdirs = "$(DESTDIR)$(libexecsubdir)" am__installdirs = "$(DESTDIR)$(libexecsubdir)"
LTLIBRARIES = $(libexecsub_LTLIBRARIES) LTLIBRARIES = $(libexecsub_LTLIBRARIES)
liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \ 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 am_liblto_plugin_la_OBJECTS = lto-plugin.lo
liblto_plugin_la_OBJECTS = $(am_liblto_plugin_la_OBJECTS) liblto_plugin_la_OBJECTS = $(am_liblto_plugin_la_OBJECTS)
liblto_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ liblto_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
...@@ -231,13 +231,10 @@ libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) ...@@ -231,13 +231,10 @@ libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
AM_CFLAGS = -Wall -Werror AM_CFLAGS = -Wall -Werror
AM_LIBTOOLFLAGS = --tag=disable-static AM_LIBTOOLFLAGS = --tag=disable-static
# This can go away when libiberty becomes a normal convenience library
Wl = -Wl,
libexecsub_LTLIBRARIES = liblto_plugin.la libexecsub_LTLIBRARIES = liblto_plugin.la
liblto_plugin_la_SOURCES = lto-plugin.c liblto_plugin_la_SOURCES = lto-plugin.c
liblto_plugin_la_LIBADD = \ 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 # Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \ liblto_plugin_la_LDFLAGS = $(lt_host_flags) -bindir $(libexecsubdir) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment