From c164615b36abdfcb7934b9cd449a1813987ac7cd Mon Sep 17 00:00:00 2001
From: Richard Guenther <rguenther@suse.de>
Date: Mon, 11 Jan 2010 12:38:09 +0000
Subject: [PATCH] re PR lto/41569 (.../prev-gcc/xgcc used for the install step
of the lto-plugin)
2010-01-11 Richard Guenther <rguenther@suse.de>
PR lto/41569
* Makefile.def (all-lto-plugin): Depend on all-gcc.
* Makefile.in: Regenerated.
lto-plugin/
* Makefile.am: Disable dependencies.
* Makefile.in: Regenerated.
From-SVN: r155809
---
ChangeLog | 6 ++++++
Makefile.def | 2 +-
Makefile.in | 16 ++++++++--------
lto-plugin/ChangeLog | 6 ++++++
lto-plugin/Makefile.am | 1 +
lto-plugin/Makefile.in | 37 ++++++++++---------------------------
6 files changed, 32 insertions(+), 36 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 70545162f25b..22791c4ec216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-11 Richard Guenther <rguenther@suse.de>
+
+ PR lto/41569
+ * Makefile.def (all-lto-plugin): Depend on all-gcc.
+ * Makefile.in: Regenerated.
+
2010-01-11 Andreas Tobler <andreast@fgznet.ch>
* configure.ac: Enable libjava build on x86_64-*freebsd*.
diff --git a/Makefile.def b/Makefile.def
index f5c2e11f990d..5a05469086dc 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -352,7 +352,7 @@ dependencies = { module=all-fixincludes; on=all-libiberty; };
dependencies = { module=all-gnattools; on=all-target-libada; };
-dependencies = { module=all-lto-plugin; on=all-libiberty; };
+dependencies = { module=all-lto-plugin; on=all-gcc; };
dependencies = { module=configure-mpfr; on=all-gmp; };
dependencies = { module=configure-mpc; on=all-mpfr; };
diff --git a/Makefile.in b/Makefile.in
index 6f1c1403fbb0..c02436d433d5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -57407,14 +57407,14 @@ all-stageprofile-libcpp: maybe-all-stageprofile-intl
all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
all-fixincludes: maybe-all-libiberty
all-gnattools: maybe-all-target-libada
-all-lto-plugin: maybe-all-libiberty
-
-all-stage1-lto-plugin: maybe-all-stage1-libiberty
-all-stage2-lto-plugin: maybe-all-stage2-libiberty
-all-stage3-lto-plugin: maybe-all-stage3-libiberty
-all-stage4-lto-plugin: maybe-all-stage4-libiberty
-all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty
-all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty
+all-lto-plugin: maybe-all-gcc
+
+all-stage1-lto-plugin: maybe-all-stage1-gcc
+all-stage2-lto-plugin: maybe-all-stage2-gcc
+all-stage3-lto-plugin: maybe-all-stage3-gcc
+all-stage4-lto-plugin: maybe-all-stage4-gcc
+all-stageprofile-lto-plugin: maybe-all-stageprofile-gcc
+all-stagefeedback-lto-plugin: maybe-all-stagefeedback-gcc
configure-mpfr: maybe-all-gmp
configure-stage1-mpfr: maybe-all-stage1-gmp
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog
index 4848e279397b..9336ac925555 100644
--- a/lto-plugin/ChangeLog
+++ b/lto-plugin/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-11 Richard Guenther <rguenther@suse.de>
+
+ PR lto/41569
+ * Makefile.am: Disable dependencies.
+ * Makefile.in: Regenerated.
+
2010-01-03 H.J. Lu <hongjiu.lu@intel.com>
PR lto/42520
diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am
index 19fbdcd8ef5a..665ce1909880 100644
--- a/lto-plugin/Makefile.am
+++ b/lto-plugin/Makefile.am
@@ -1,6 +1,7 @@
# Makefile.am is used by automake 1.11 to generate Makefile.in.
ACLOCAL_AMFLAGS = -I .. -I ../config
+AUTOMAKE_OPTIONS = no-dependencies
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
target_noncanonical := @target_noncanonical@
diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
index 74afd59096d0..16b843c69b65 100644
--- a/lto-plugin/Makefile.in
+++ b/lto-plugin/Makefile.in
@@ -38,11 +38,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \
- $(srcdir)/../config.sub $(srcdir)/../depcomp \
- $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \
- $(srcdir)/../missing $(srcdir)/../mkinstalldirs \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/configure ChangeLog
+ $(srcdir)/../config.sub $(srcdir)/../install-sh \
+ $(srcdir)/../ltmain.sh $(srcdir)/../missing \
+ $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/configure ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/depstand.m4 \
@@ -87,9 +86,8 @@ liblto_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
am_liblto_plugin_la_OBJECTS = lto-plugin.lo
liblto_plugin_la_OBJECTS = $(am_liblto_plugin_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/../depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
+depcomp =
+am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -235,6 +233,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I .. -I ../config
+AUTOMAKE_OPTIONS = no-dependencies
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
AM_CPPFLAGS = -I$(top_srcdir)/../include $(LIBELFINC)
@@ -320,28 +319,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lto-plugin.Plo@am__quote@
-
.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ $(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -589,7 +574,6 @@ clean-am: clean-generic clean-libexecsubLTLIBRARIES clean-libtool \
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
@@ -637,7 +621,6 @@ installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
--
GitLab