Patchwork Sync toplevel and config from GCC to src

login
register
mail settings
Submitter Ralf Wildenhues
Date Feb. 12, 2011, 2:40 p.m.
Message ID <20110212144007.GB6773@gmx.de>
Download mbox | patch
Permalink /patch/82911/
State New
Headers show

Comments

Ralf Wildenhues - Feb. 12, 2011, 2:40 p.m.
I'm syncing toplevel and config/ from GCC to src as follows.

Thanks,
Ralf

2011-02-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	Sync from GCC:

	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.
	* configure: Regenerate.

	2011-02-06  Kai Tietz  <kai.tietz@onevision.com>

	PR lto/47225
	* Makefile.def: Add dependency for install-gcc
	on install-lto-plugin.
	* Makfile.in: Regenerated

	2011-01-25  Jakub Jelinek  <jakub@redhat.com>

	* configure.ac: If with_ppl is no, move setting with_cloog=no
	after CLOOG_REQUESTED check.
	* configure: Regenerated.

	2011-01-25  Sebastian Pop  <sebastian.pop@amd.com>

	* configure.ac: Call AC_MSG_ERROR when PPL 0.11 is not present and
	CLooG has been requested.
	* configure: Regenerated.

	2011-01-25  Sebastian Pop  <sebastian.pop@amd.com>

	* configure: Regenerated.
	* configure.ac: Check for version 0.11 (or later revision) of PPL.

	2011-01-25  Tobias Grosser  <grosser@fim.uni-passau.de>

	* configure: Regenerated.
	* configure.ac: Use CLOOG_CHECK_VERSION(0,16,1).

	2011-01-07  Jan Hubicka  <jh@suse.cz>

	PR lto/47225
	* Makefile.in: Regenerate.
	* Makefile.def (lto-plugin): Always pass enable-shared to the plugin
	configure.

config/:
2011-01-25  Jakub Jelinek  <jakub@redhat.com>

	* cloog.m4 (CLOOG_REQUESTED): Use $2 if --without-cloog.

2011-01-10  Jan Hubicka  <jh@suse.cz>

	* bootstrap-lto.mk: -fuse-linker-plugin is default now;
	pass -fno-lto to STAGEprofile.

Patch

Index: Makefile.def
===================================================================
RCS file: /cvs/src/src/Makefile.def,v
retrieving revision 1.116
diff -u -r1.116 Makefile.def
--- Makefile.def	26 Nov 2010 04:56:38 -0000	1.116
+++ Makefile.def	12 Feb 2011 14:20:39 -0000
@@ -4,7 +4,7 @@ 
 // Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
 // This file was originally written by Nathanael Nerode.
 //
-//   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+//   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 //   Free Software Foundation
 //
 // This file is free software; you can redistribute it and/or modify
@@ -145,7 +145,8 @@ 
                 missing=maintainer-clean; };
 host_modules= { module= utils; no_check=true; };
 host_modules= { module= gnattools; };
-host_modules= { module= lto-plugin; bootstrap=true; };
+host_modules= { module= lto-plugin; bootstrap=true;
+		extra_configure_flags=--enable-shared; };
 
 target_modules = { module= libstdc++-v3;
 		   bootstrap=true;
@@ -321,6 +322,7 @@ 
 
 // Host modules specific to gcc.
 dependencies = { module=configure-gcc; on=configure-intl; };
+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; };
@@ -344,11 +346,13 @@ 
 dependencies = { module=all-gcc; on=all-libdecnumber; hard=true; };
 dependencies = { module=all-gcc; on=all-libiberty; };
 dependencies = { module=all-gcc; on=all-fixincludes; };
+dependencies = { module=all-gcc; on=all-lto-plugin; };
 dependencies = { module=info-gcc; on=all-build-libiberty; };
 dependencies = { module=dvi-gcc; on=all-build-libiberty; };
 dependencies = { module=pdf-gcc; on=all-build-libiberty; };
 dependencies = { module=html-gcc; on=all-build-libiberty; };
 dependencies = { module=install-gcc ; on=install-fixincludes; };
+dependencies = { module=install-gcc ; on=install-lto-plugin; };
 dependencies = { module=install-strip-gcc ; on=install-strip-fixincludes; };
 
 dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; };
@@ -360,7 +364,7 @@ 
 
 dependencies = { module=all-gnattools; on=all-target-libada; };
 
-dependencies = { module=all-lto-plugin; on=all-gcc; };
+dependencies = { module=all-lto-plugin; on=all-libiberty; };
 
 dependencies = { module=configure-mpfr; on=all-gmp; };
 dependencies = { module=configure-mpc; on=all-mpfr; };
Index: Makefile.tpl
===================================================================
RCS file: /cvs/src/src/Makefile.tpl,v
retrieving revision 1.221
diff -u -r1.221 Makefile.tpl
--- Makefile.tpl	26 Nov 2010 04:56:38 -0000	1.221
+++ Makefile.tpl	12 Feb 2011 14:20:41 -0000
@@ -6,7 +6,7 @@ 
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
Index: configure.ac
===================================================================
RCS file: /cvs/src/src/configure.ac,v
retrieving revision 1.126
diff -u -r1.126 configure.ac
--- configure.ac	31 Jan 2011 05:26:01 -0000	1.126
+++ configure.ac	12 Feb 2011 14:20:42 -0000
@@ -1668,9 +1668,9 @@ 
 if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then
   saved_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $pplinc $gmpinc"
-  AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL])
+  AC_MSG_CHECKING([for version 0.11 (or later revision) of PPL])
   AC_TRY_COMPILE([#include "ppl_c.h"],[
-  #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
+  #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
   choke me
   #endif
   ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
@@ -1688,6 +1688,11 @@ 
 dnl with user input.
 CLOOG_INIT_FLAGS
 if test "x$with_ppl" = "xno"; then
+  dnl Only execute fail-action, if CLooG has been requested.
+  CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no])
+  if test "${graphite_requested}" = yes; then
+    AC_MSG_ERROR([Unable to find a usable PPL.  See config.log for details.])
+  fi
   with_cloog=no
 fi
 if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \
@@ -1696,24 +1701,15 @@ 
   clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include '
 fi
 if test "x$with_cloog" != "xno"; then
-  dnl Version check for CLooG-Org
-  dnl As long as there is no new release of CLooG,
-  dnl we will check for 0.14.0.
-  dnl
-  dnl The first git revision that will work with
-  dnl GCC is: bd91b845a65805c290d43fc1bef8139864a163fb
-  dnl This is enforced implictly, as this is the commit that
-  dnl introduced the versioning information used within our
-  dnl checks.
+  dnl The minimal version of CLooG required for Graphite.
   dnl
-  dnl If we're using CLooG-Legacy, the provided version information
-  dnl will be ignored.
-  CLOOG_CHECK_VERSION(0,14,0)
+  dnl If we use CLooG-Legacy, the provided version information is
+  dnl ignored.
+  CLOOG_CHECK_VERSION(0,16,1)
 
-  dnl Only execute fail-action, if CLooG has been
-  dnl requested.
+  dnl Only execute fail-action, if CLooG has been requested.
   CLOOG_IF_FAILED([
-    AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])])
+    AC_MSG_ERROR([Unable to find a usable CLooG.  See config.log for details.])])
 fi
 
 # Check for LTO support.
Index: config/bootstrap-lto.mk
===================================================================
RCS file: /cvs/src/src/config/bootstrap-lto.mk,v
retrieving revision 1.4
diff -u -r1.4 bootstrap-lto.mk
--- config/bootstrap-lto.mk	27 Nov 2010 15:55:17 -0000	1.4
+++ config/bootstrap-lto.mk	12 Feb 2011 14:20:43 -0000
@@ -1,5 +1,6 @@ 
 # This option enables LTO for stage2 and stage3.  It requires lto to
 # be enabled for stage1 with --enable-stage1-languages.
 
-STAGE2_CFLAGS += -flto=jobserver -fuse-linker-plugin -frandom-seed=1
-STAGE3_CFLAGS += -flto=jobserver -fuse-linker-plugin -frandom-seed=1
+STAGE2_CFLAGS += -flto=jobserver -frandom-seed=1
+STAGE3_CFLAGS += -flto=jobserver -frandom-seed=1
+STAGEprofile_CFLAGS +=  -fno-lto
Index: config/cloog.m4
===================================================================
RCS file: /cvs/src/src/config/cloog.m4,v
retrieving revision 1.2
diff -u -r1.2 cloog.m4
--- config/cloog.m4	20 Nov 2010 20:31:10 -0000	1.2
+++ config/cloog.m4	12 Feb 2011 14:20:43 -0000
@@ -88,7 +88,9 @@ 
 [
   AC_REQUIRE([CLOOG_INIT_FLAGS])
 
-  if test "x${with_cloog}" != x \
+  if test "x${with_cloog}" = xno; then
+    $2
+  elif test "x${with_cloog}" != x \
     || test "x${with_cloog_include}" != x \
     || test "x${with_cloog_lib}" != x ; then
     $1