r6693 - in branches/gcc4/BOOK: . chapter01 chapter05 chapter06

matthew at linuxfromscratch.org matthew at linuxfromscratch.org
Mon Aug 15 14:40:17 PDT 2005


Author: matthew
Date: 2005-08-15 15:40:17 -0600 (Mon, 15 Aug 2005)
New Revision: 6693

Modified:
   branches/gcc4/BOOK/chapter01/changelog.xml
   branches/gcc4/BOOK/chapter05/gcc-pass2.xml
   branches/gcc4/BOOK/chapter06/gcc.xml
   branches/gcc4/BOOK/general.ent
Log:
Prevent GCC's -fomit-frame-pointer sed from breaking if invoked more than once

Modified: branches/gcc4/BOOK/chapter01/changelog.xml
===================================================================
--- branches/gcc4/BOOK/chapter01/changelog.xml	2005-08-15 19:43:59 UTC (rev 6692)
+++ branches/gcc4/BOOK/chapter01/changelog.xml	2005-08-15 21:40:17 UTC (rev 6693)
@@ -118,6 +118,9 @@
 </itemizedlist>
 </listitem>
 
+<listitem><para>August 15th, 2005 [matt]: Alter the GCC -fomit-frame-pointer sed
+to protect from multiple invocations (Greg Schafer)</para></listitem>
+
 <listitem><para>August 14th, 2005 [matt]: Mention the common libmudflap test
 failures in GCC (fixes bug 1615).</para></listitem>
 

Modified: branches/gcc4/BOOK/chapter05/gcc-pass2.xml
===================================================================
--- branches/gcc4/BOOK/chapter05/gcc-pass2.xml	2005-08-15 19:43:59 UTC (rev 6692)
+++ branches/gcc4/BOOK/chapter05/gcc-pass2.xml	2005-08-15 21:40:17 UTC (rev 6693)
@@ -82,7 +82,7 @@
 <command>sed</command> to use it in order to ensure consistent compiler builds.
 </para>
 
-<screen><userinput>sed -i 's/^XCFLAGS =/& -fomit-frame-pointer/' gcc/Makefile.in</userinput></screen>
+<screen><userinput>sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in</userinput></screen>
 
 <para>Apply the following patch to change the location of GCC's default dynamic
 linker (typically <filename class="libraryfile">ld-linux.so.2</filename>):</para>

Modified: branches/gcc4/BOOK/chapter06/gcc.xml
===================================================================
--- branches/gcc4/BOOK/chapter06/gcc.xml	2005-08-15 19:43:59 UTC (rev 6692)
+++ branches/gcc4/BOOK/chapter06/gcc.xml	2005-08-15 21:40:17 UTC (rev 6693)
@@ -51,7 +51,7 @@
 <command>sed</command> to use it in order to ensure consistent compiler builds.
 </para>
 
-<screen><userinput>sed -i 's/^XCFLAGS =/& -fomit-frame-pointer/' gcc/Makefile.in</userinput></screen>
+<screen><userinput>sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in</userinput></screen>
 
 <para>The GCC documentation recommends building GCC outside of the source
 directory in a dedicated build directory:</para>

Modified: branches/gcc4/BOOK/general.ent
===================================================================
--- branches/gcc4/BOOK/general.ent	2005-08-15 19:43:59 UTC (rev 6692)
+++ branches/gcc4/BOOK/general.ent	2005-08-15 21:40:17 UTC (rev 6693)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "GCC4-20050814">
-<!ENTITY releasedate "August 14, 2005">
+<!ENTITY version "GCC4-20050815">
+<!ENTITY releasedate "August 15, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "gcc4"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 




More information about the lfs-book mailing list