summaryrefslogtreecommitdiff
path: root/lto-plugin
diff options
context:
space:
mode:
authorktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>2011-02-07 20:32:17 +0000
committerktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>2011-02-07 20:32:17 +0000
commite5cc6ffe73304ecedc9cc21e33b7002a77448ee3 (patch)
treebf0e0a864576ea8afe61223964b4344158381b3e /lto-plugin
parentec53f8780fb3de0f60ab7c828d54f2b8f70dbf25 (diff)
downloadgcc-e5cc6ffe73304ecedc9cc21e33b7002a77448ee3.tar.gz
2011-02-07 Kai Tietz <kai.tietz@onevision.com>
PR lto/47225 * Makefile.am (Wc): New helper for encoding -Wc,. (liblto_plugin_la_LIBADD): Use Wc for libiberty library. (liblto_plugin_la_DEPENDENCIES): Special case pic libiberty. * Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169900 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'lto-plugin')
-rw-r--r--lto-plugin/ChangeLog8
-rw-r--r--lto-plugin/Makefile.am7
-rw-r--r--lto-plugin/Makefile.in10
3 files changed, 21 insertions, 4 deletions
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog
index 014634520ae..1129a378432 100644
--- a/lto-plugin/ChangeLog
+++ b/lto-plugin/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-07 Kai Tietz <kai.tietz@onevision.com>
+
+ PR lto/47225
+ * Makefile.am (Wc): New helper for encoding -Wc,.
+ (liblto_plugin_la_LIBADD): Use Wc for libiberty library.
+ (liblto_plugin_la_DEPENDENCIES): Special case pic libiberty.
+ * Makefile.in: Regenerated.
+
2011-02-07 Paolo Bonzini <bonzini@gnu.org>
Revert:
diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am
index a51bc4a9739..a150f80f50c 100644
--- a/lto-plugin/Makefile.am
+++ b/lto-plugin/Makefile.am
@@ -13,12 +13,17 @@ AM_LIBTOOLFLAGS = --tag=disable-static
libexecsub_LTLIBRARIES = liblto_plugin.la
+# Can be removed when libiberty becomes a normal convenience library
+Wc=-Wc,
+
liblto_plugin_la_SOURCES = lto-plugin.c
liblto_plugin_la_LIBADD = \
- $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
+ $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wc)../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)
+liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
+ ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
all: copy_lto_plugin
diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
index 2e283f7a0eb..aa14e52a031 100644
--- a/lto-plugin/Makefile.in
+++ b/lto-plugin/Makefile.in
@@ -81,8 +81,6 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libexecsubdir)"
LTLIBRARIES = $(libexecsub_LTLIBRARIES)
-liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
- ../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) \
@@ -232,14 +230,20 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
AM_CFLAGS = -Wall -Werror
AM_LIBTOOLFLAGS = --tag=disable-static
libexecsub_LTLIBRARIES = liblto_plugin.la
+
+# Can be removed when libiberty becomes a normal convenience library
+Wc = -Wc,
liblto_plugin_la_SOURCES = lto-plugin.c
liblto_plugin_la_LIBADD = \
- $(if $(wildcard ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
+ $(if $(wildcard ../libiberty/pic/libiberty.a),$(Wc)../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)
+liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
+ ../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
+
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am