On Sat, Feb 23, 2013 at 09:56:20AM -0600, Bruce Dubbs wrote:
> Ken Moffat wrote:
> > On Sat, Feb 23, 2013 at 01:31:31PM +0000, Matt Burgess wrote:
> >> On Fri, 2013-02-22 at 23:17 +0000, Matt Burgess wrote:
> >>
> >>> I think it's probably fine too.  I probably won't have time to run a
> >>> test build this weekend with it in though.
> >>
> >> So, I managed to carve out some time :-)  I've decided to upgrade
> >> IPRoute2 as well, so as we get support for the new networking bits in
> >> Linux-3.8 too.  Commit should be made tomorrow.
> >>
> >> Regards,
> >>
> >> Matt.
> 
> I'll see if I can put together a consolidated patch.
> 
>    -- Bruce
> 

 Cheers, I've just been preparing one (without the three ChangeLog
parts).  Attached.

ĸen
-- 
das eine Mal als Tragödie, das andere Mal als Farce
not yet Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
Date: 2013-02-23
Initial Package Version: 4.7.2
Upstream Status: Applied
Origin: Upstream
Description: http://gcc.gnu.org/viewcvs?view=revision&revision=196197
without the ChangeLog parts.  Re PR-bootstrap-56258 - fixes building
with texinfo-5 (not yet tested).

diff -Naur gcc-4.7.2.orig/gcc/ada/gnat-style.texi 
gcc-4.7.2/gcc/ada/gnat-style.texi
--- gcc-4.7.2.orig/gcc/ada/gnat-style.texi      2011-08-02 08:42:46.000000000 
+0100
+++ gcc-4.7.2/gcc/ada/gnat-style.texi   2013-02-23 16:34:18.155215155 +0000
@@ -42,7 +42,7 @@
 @titlepage
 @titlefont{GNAT Coding Style:}
 @sp 1
-@title @hfill A Guide for GNAT Developers
+@title A Guide for GNAT Developers
 @subtitle GNAT, The GNU Ada Compiler
 @versionsubtitle
 @author Ada Core Technologies, Inc.
diff -Naur gcc-4.7.2.orig/gcc/ada/projects.texi gcc-4.7.2/gcc/ada/projects.texi
--- gcc-4.7.2.orig/gcc/ada/projects.texi        2012-02-22 14:03:25.000000000 
+0000
+++ gcc-4.7.2/gcc/ada/projects.texi     2013-02-23 16:34:18.155215155 +0000
@@ -48,8 +48,7 @@
 @item Source file naming conventions; you can specify these either globally or 
for
   individual compilation units (@pxref{Naming Schemes}).
 @item Change any of the above settings depending on external values, thus 
enabling
-  the reuse of the projects in various @b{scenarios} (@pxref{Scenarios
-  in Projects}).
+  the reuse of the projects in various @b{scenarios} (@pxref{Scenarios in 
Projects}).
 @item Automatically build libraries as part of the build process
   (@pxref{Library Projects}).
 
@@ -353,8 +352,8 @@
 
 @item For various reasons, it is sometimes useful to have a project with no
   sources (most of the time because the attributes defined in the project
-  file will be reused in other projects, as explained in @pxref{Organizing
-  Projects into Subsystems}. To do this, the attribute
+  file will be reused in other projects, as explained in
+  @pxref{Organizing Projects into Subsystems}. To do this, the attribute
   @emph{Source_Files} is set to the empty list, i.e. @code{()}. Alternatively,
   @emph{Source_Dirs} can be set to the empty list, with the same
   result.
@@ -381,8 +380,9 @@
   This can be done thanks to the attribute @b{Excluded_Source_Files}
   (or its synonym @b{Locally_Removed_Files}).
   Its value is the list of file names that should not be taken into account.
-  This attribute is often used when extending a project, @xref{Project
-  Extension}. A similar attribute @b{Excluded_Source_List_File} plays the same
+  This attribute is often used when extending a project,
+  @xref{Project Extension}. A similar attribute
+  @b{Excluded_Source_List_File} plays the same
   role but takes the name of file containing file names similarly to
   @code{Source_List_File}.
 
diff -Naur gcc-4.7.2.orig/gcc/doc/invoke.texi gcc-4.7.2/gcc/doc/invoke.texi
--- gcc-4.7.2.orig/gcc/doc/invoke.texi  2012-09-14 21:45:27.000000000 +0100
+++ gcc-4.7.2/gcc/doc/invoke.texi       2013-02-23 16:34:18.167215842 +0000
@@ -5433,7 +5433,7 @@
 @opindex fdump-rtl-postreload
 Dump after post-reload optimizations.
 
-@itemx -fdump-rtl-pro_and_epilogue
+@item -fdump-rtl-pro_and_epilogue
 @opindex fdump-rtl-pro_and_epilogue
 Dump after generating the function prologues and epilogues.
 
diff -Naur gcc-4.7.2.orig/libjava/classpath/doc/cp-tools.texinfo 
gcc-4.7.2/libjava/classpath/doc/cp-tools.texinfo
--- gcc-4.7.2.orig/libjava/classpath/doc/cp-tools.texinfo       2012-08-06 
15:34:27.000000000 +0100
+++ gcc-4.7.2/libjava/classpath/doc/cp-tools.texinfo    2013-02-23 
16:34:18.167215842 +0000
@@ -2022,7 +2022,7 @@
 
 @item Virtual Machine Options
 @xref{Virtual Machine Options,,Options Controlling Gjdoc Behavior}.
-@gccoptlist{-classpath}  @gccoptlist{-bootclasspath}  
@gccoptlist{-J}@var{vmopt}
+@gccoptlist{-classpath  -bootclasspath  -J @var{vmopt}}
 
 @end table
 
-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to