Skip to content

GitLab

Commit 98de5262 authored by aoliva's avatar aoliva
Browse files

ChangeLog: 

PR lto/47225
* Makefile.def (lto-plugin): Double dash for enable-shared.
(configure-gcc): Depend on all-lto-plugin.
* Makefile.in: Rebuilt.
lto-plugin/ChangeLog:
PR lto/47225
* Makefile.am (gcc_build_dir, in_gcc_libs): New.
(liblto_plugin_la_LDFLAGS): Add -module.
(copy_lto_plugin): Renamed to...
($(in_gcc_libs)): ... this.  Add mkinstalldirs.  Skip copying
of static modules.
* Makefile.in: Rebuild.
gcc/ChangeLog:
PR lto/47225
* configure.ac (gcc_cv_lto_plugin): Test for liblto_plugin.la
in the current directory.
* configure: Rebuilt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170070 138bc75d-0d04-0410-961f-82ee72b054a4
parent 5886e9ab
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 28 deletions
ChangeLog
View file @ 98de5262
2011-02-12 Alexandre Oliva <aoliva@redhat.com>
PR lto/47225
* Makefile.def (lto-plugin): Double dash for enable-shared.
(configure-gcc): Depend on all-lto-plugin.
* Makefile.in: Rebuilt.
2011-02-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac: Remove extra bracket.
......
Makefile.def
View file @ 98de5262
......@@ -146,7 +146,7 @@ host_modules= { module= libtermcap; no_check=true;
host_modules= { module= utils; no_check=true; };
host_modules= { module= gnattools; };
host_modules= { module= lto-plugin; bootstrap=true;
extra_configure_flags=-enable-shared; };
extra_configure_flags=--enable-shared; };
target_modules = { module= libstdc++-v3;
bootstrap=true;
......@@ -322,7 +322,7 @@ dependencies = { module=all-build-fixincludes; on=all-build-libiberty; };
// Host modules specific to gcc.
dependencies = { module=configure-gcc; on=configure-intl; };
dependencies = { module=configure-gcc; on=configure-lto-plugin; };
dependencies = { module=configure-gcc; on=all-lto-plugin; };
dependencies = { module=configure-gcc; on=all-binutils; };
dependencies = { module=configure-gcc; on=all-gas; };
dependencies = { module=configure-gcc; on=all-ld; };
......
Makefile.in
View file @ 98de5262
......@@ -45248,7 +45248,7 @@ configure-lto-plugin:
libsrcdir="$$s/lto-plugin"; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} $${srcdiroption} -enable-shared \
--target=${target_alias} $${srcdiroption} --enable-shared \
|| exit 1
@endif lto-plugin
 
......@@ -45283,7 +45283,7 @@ configure-stage1-lto-plugin:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} $${srcdiroption} \
$(STAGE1_CONFIGURE_FLAGS) \
-enable-shared
--enable-shared
@endif lto-plugin-bootstrap
 
.PHONY: configure-stage2-lto-plugin maybe-configure-stage2-lto-plugin
......@@ -45317,7 +45317,7 @@ configure-stage2-lto-plugin:
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE2_CONFIGURE_FLAGS) \
-enable-shared
--enable-shared
@endif lto-plugin-bootstrap
 
.PHONY: configure-stage3-lto-plugin maybe-configure-stage3-lto-plugin
......@@ -45351,7 +45351,7 @@ configure-stage3-lto-plugin:
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE3_CONFIGURE_FLAGS) \
-enable-shared
--enable-shared
@endif lto-plugin-bootstrap
 
.PHONY: configure-stage4-lto-plugin maybe-configure-stage4-lto-plugin
......@@ -45385,7 +45385,7 @@ configure-stage4-lto-plugin:
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE4_CONFIGURE_FLAGS) \
-enable-shared
--enable-shared
@endif lto-plugin-bootstrap
 
.PHONY: configure-stageprofile-lto-plugin maybe-configure-stageprofile-lto-plugin
......@@ -45419,7 +45419,7 @@ configure-stageprofile-lto-plugin:
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGEprofile_CONFIGURE_FLAGS) \
-enable-shared
--enable-shared
@endif lto-plugin-bootstrap
 
.PHONY: configure-stagefeedback-lto-plugin maybe-configure-stagefeedback-lto-plugin
......@@ -45453,7 +45453,7 @@ configure-stagefeedback-lto-plugin:
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGEfeedback_CONFIGURE_FLAGS) \
-enable-shared
--enable-shared
@endif lto-plugin-bootstrap
 
 
......@@ -60266,14 +60266,14 @@ configure-stage3-gcc: maybe-configure-stage3-intl
configure-stage4-gcc: maybe-configure-stage4-intl
configure-stageprofile-gcc: maybe-configure-stageprofile-intl
configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
configure-gcc: maybe-configure-lto-plugin
configure-stage1-gcc: maybe-configure-stage1-lto-plugin
configure-stage2-gcc: maybe-configure-stage2-lto-plugin
configure-stage3-gcc: maybe-configure-stage3-lto-plugin
configure-stage4-gcc: maybe-configure-stage4-lto-plugin
configure-stageprofile-gcc: maybe-configure-stageprofile-lto-plugin
configure-stagefeedback-gcc: maybe-configure-stagefeedback-lto-plugin
configure-gcc: maybe-all-lto-plugin
configure-stage1-gcc: maybe-all-stage1-lto-plugin
configure-stage2-gcc: maybe-all-stage2-lto-plugin
configure-stage3-gcc: maybe-all-stage3-lto-plugin
configure-stage4-gcc: maybe-all-stage4-lto-plugin
configure-stageprofile-gcc: maybe-all-stageprofile-lto-plugin
configure-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin
configure-gcc: maybe-all-binutils
 
configure-stage1-gcc: maybe-all-stage1-binutils
gcc/ChangeLog
View file @ 98de5262
2011-02-12 Alexandre Oliva <aoliva@redhat.com>
PR lto/47225
* configure.ac (gcc_cv_lto_plugin): Test for liblto_plugin.la
in the current directory.
* configure: Rebuilt.
2011-02-12 Iain Sandoe <iains@gcc.gnu.org>
* config/darwin.c (darwin_override_options): Add a hunk missed
......
gcc/configure
View file @ 98de5262
......@@ -23125,7 +23125,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker plugin support" >&5
$as_echo_n "checking linker plugin support... " >&6; }
gcc_cv_lto_plugin=no
if test -f ../lto-plugin/Makefile ; then
if test -f liblto_plugin.la; then
if test $in_tree_ld = yes -a x"$ORIGINAL_PLUGIN_LD_FOR_TARGET=" = x"$gcc_cv_ld"; then
if test x"$ld_is_gold" = xyes; then
gcc_cv_lto_plugin=yes
......
gcc/configure.ac
View file @ 98de5262
......@@ -3174,7 +3174,7 @@ fi
AC_MSG_CHECKING(linker plugin support)
gcc_cv_lto_plugin=no
if test -f ../lto-plugin/Makefile ; then
if test -f liblto_plugin.la; then
if test $in_tree_ld = yes -a x"$ORIGINAL_PLUGIN_LD_FOR_TARGET=" = x"$gcc_cv_ld"; then
if test x"$ld_is_gold" = xyes; then
gcc_cv_lto_plugin=yes
......
lto-plugin/ChangeLog
View file @ 98de5262
2011-02-12 Alexandre Oliva <aoliva@redhat.com>
PR lto/47225
* Makefile.am (gcc_build_dir, in_gcc_libs): New.
(liblto_plugin_la_LDFLAGS): Add -module.
(copy_lto_plugin): Renamed to...
($(in_gcc_libs)): ... this. Add mkinstalldirs. Skip copying
of static modules.
* Makefile.in: Rebuild.
2011-02-07 Kai Tietz <kai.tietz@onevision.com>
PR lto/47225
......
lto-plugin/Makefile.am
View file @ 98de5262
......@@ -12,6 +12,8 @@ AM_CFLAGS = -Wall -Werror
AM_LIBTOOLFLAGS = --tag=disable-static
libexecsub_LTLIBRARIES = liblto_plugin.la
gcc_build_dir = ../gcc
in_gcc_libs = $(foreach lib, $(libexecsub_LTLIBRARIES), $(gcc_build_dir)/$(lib))
# Can be removed when libiberty becomes a normal convenience library
Wc=-Wc,
......@@ -20,13 +22,17 @@ liblto_plugin_la_SOURCES = lto-plugin.c
liblto_plugin_la_LIBADD = \
$(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) \
liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -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
copy_lto_plugin: all-am
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(libexecsub_LTLIBRARIES) `pwd`/../gcc/
all: $(in_gcc_libs)
$(in_gcc_libs) : $(gcc_build_dir)/%: %
@if test "X`dlname=; . ./$*; echo dlname:$$dlname`" = "Xdlname:"; then \
echo WARNING: $* is static, not copying to $@ >&2 ; \
else \
$(mkinstalldirs) $(gcc_build_dir) && \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $* `pwd`/$@ ; \
fi
lto-plugin/Makefile.in
View file @ 98de5262
......@@ -230,6 +230,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
AM_CFLAGS = -Wall -Werror
AM_LIBTOOLFLAGS = --tag=disable-static
libexecsub_LTLIBRARIES = liblto_plugin.la
gcc_build_dir = ../gcc
in_gcc_libs = $(foreach lib, $(libexecsub_LTLIBRARIES), $(gcc_build_dir)/$(lib))
# Can be removed when libiberty becomes a normal convenience library
Wc = -Wc,
......@@ -238,7 +240,7 @@ liblto_plugin_la_LIBADD = \
$(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) \
liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -bindir $(libexecsubdir) \
$(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)
liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
......@@ -530,10 +532,15 @@ uninstall-am: uninstall-libexecsubLTLIBRARIES
tags uninstall uninstall-am uninstall-libexecsubLTLIBRARIES
all: copy_lto_plugin
all: $(in_gcc_libs)
copy_lto_plugin: all-am
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(libexecsub_LTLIBRARIES) `pwd`/../gcc/
$(in_gcc_libs) : $(gcc_build_dir)/%: %
@if test "X`dlname=; . ./$*; echo dlname:$$dlname`" = "Xdlname:"; then \
echo WARNING: $* is static, not copying to $@ >&2 ; \
else \
$(mkinstalldirs) $(gcc_build_dir) && \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $* `pwd`/$@ ; \
fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
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

Powered by Integricloud