Author: jim Date: 2005-09-02 13:09:38 -0600 (Fri, 02 Sep 2005) New Revision: 6797
Modified: branches/cross-lfs/BOOK/ branches/cross-lfs/BOOK/final-system/alpha/adjusting.xml branches/cross-lfs/BOOK/final-system/mips/adjusting.xml branches/cross-lfs/BOOK/final-system/mips64-64/adjusting.xml branches/cross-lfs/BOOK/final-system/mips64/adjusting.xml branches/cross-lfs/BOOK/final-system/ppc/adjusting.xml branches/cross-lfs/BOOK/final-system/sparc64-64/adjusting.xml branches/cross-lfs/BOOK/final-system/sparc64/adjusting.xml branches/cross-lfs/BOOK/final-system/x86/adjusting.xml branches/cross-lfs/BOOK/final-system/x86_64-64/adjusting.xml branches/cross-lfs/BOOK/final-system/x86_64/adjusting.xml branches/cross-lfs/BOOK/introduction/common/changelog.xml Log: [EMAIL PROTECTED]: jim | 2005-09-02 12:09:00 -0700 Adjusting update for GCC 4.x Property changes on: branches/cross-lfs/BOOK ___________________________________________________________________ Name: svk:merge - 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7336 dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516 + 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7337 dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516 Modified: branches/cross-lfs/BOOK/final-system/alpha/adjusting.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/alpha/adjusting.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/final-system/alpha/adjusting.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -18,9 +18,10 @@ href="../x86/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; - href="../x86/adjusting.xml" - xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> +<screen os="c"><userinput>gcc -dumpspecs | \ +perl -pi -e 's@/tools/lib/ld-linux.so.2@/lib/[EMAIL PROTECTED];' \ + -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' > \ + `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../x86/adjusting.xml" Modified: branches/cross-lfs/BOOK/final-system/mips/adjusting.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/mips/adjusting.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/final-system/mips/adjusting.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -18,9 +18,9 @@ href="../x86/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> -<screen os="c"><userinput>perl -pi -e 's@ /tools/lib/ld.so.1@ /lib/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../x86/adjusting.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../x86/adjusting.xml" Modified: branches/cross-lfs/BOOK/final-system/mips64/adjusting.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/mips64/adjusting.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/final-system/mips64/adjusting.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -18,24 +18,10 @@ href="../mips/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> - <para>First we will adjust the 32 bit ABI:</para> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../mips/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> - <para>Second we will adjust the N32 ABI:</para> - -<screen><userinput>perl -pi -e 's@ /tools/lib32/ld.so.1@ /lib32/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib32/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> - - <para>Third we will adjust the 64 bit ABI:</para> - -<screen><userinput>perl -pi -e 's@ /tools/lib64/ld.so.1@ /lib64/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib64/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../mips/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> Modified: branches/cross-lfs/BOOK/final-system/mips64-64/adjusting.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/mips64-64/adjusting.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/final-system/mips64-64/adjusting.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -18,24 +18,10 @@ href="../mips/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> - <para>First we will adjust the 64 bit ABI:</para> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../mips/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> - <para>Second we will adjust the 32 ABI:</para> - -<screen><userinput>perl -pi -e 's@ /tools/lib32/ld.so.1@ /lib32/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib32/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> - - <para>Third we will adjust the N32 bit ABI:</para> - -<screen><userinput>perl -pi -e 's@ /tools/lib64/ld.so.1@ /lib64/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib64/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../mips/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> Modified: branches/cross-lfs/BOOK/final-system/ppc/adjusting.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/ppc/adjusting.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/final-system/ppc/adjusting.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -17,9 +17,9 @@ href="../x86/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> -<screen><userinput>perl -pi -e 's@ /tools/lib/ld.so.1@ /lib/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../x86/adjusting.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../x86/adjusting.xml" Modified: branches/cross-lfs/BOOK/final-system/sparc64/adjusting.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/sparc64/adjusting.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/final-system/sparc64/adjusting.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -18,18 +18,10 @@ href="../sparc/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> - <para>First we will adjust the 32 bit ABI:</para> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../sparc/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> - <para>Second we will adjust the 64 bit ABI:</para> - -<screen><userinput>perl -pi -e 's@ /tools/lib64/ld-linux-sparc-64.so.2@ /lib64/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib64/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../sparc/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> Modified: branches/cross-lfs/BOOK/final-system/sparc64-64/adjusting.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/sparc64-64/adjusting.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/final-system/sparc64-64/adjusting.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -18,18 +18,10 @@ href="../sparc/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> - <para>First we will adjust the 32 bit ABI:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../sparc/adjusting.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> -<screen><userinput>perl -pi -e 's@ /tools/lib32/ld-linux.so.2@ /lib32/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib32/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> - - <para>Second we will adjust the 64 bit ABI:</para> - -<screen><userinput>perl -pi -e 's@ /tools/lib/ld-linux-sparc-64.so.2@ /lib/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../sparc/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> Modified: branches/cross-lfs/BOOK/final-system/x86/adjusting.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/x86/adjusting.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/final-system/x86/adjusting.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -19,9 +19,10 @@ this step.</para> </warning> -<screen os="c"><userinput>perl -pi -e 's@ /tools/lib/ld-linux.so.2@ /lib/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> +<screen os="c"><userinput>gcc -dumpspecs | \ +perl -pi -e 's!-dynamic-linker /tools!-dynamic-linker !g;' \ + -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' > \ + `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen> <para os="d">It is a good idea to visually inspect the specs file to verify the intended change was actually made.</para> Modified: branches/cross-lfs/BOOK/final-system/x86_64/adjusting.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/x86_64/adjusting.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/final-system/x86_64/adjusting.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -18,18 +18,10 @@ href="../x86/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> - <para>First we will adjust the 32 bit ABI:</para> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../x86/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> - <para>Second we will adjust the 64 bit ABI:</para> - -<screen><userinput>perl -pi -e 's@ /tools/lib64/ld-linux-x86-64.so.2@ /lib64/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib64/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../x86/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> Modified: branches/cross-lfs/BOOK/final-system/x86_64-64/adjusting.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/x86_64-64/adjusting.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/final-system/x86_64-64/adjusting.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -18,18 +18,10 @@ href="../x86/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> - <para>First we will adjust the 32 bit ABI:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../x86/adjusting.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> -<screen><userinput>perl -pi -e 's@ /tools/lib32/ld-linux.so.2@ /lib32/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib32/ @g;' \ - `gcc --print-file-name=specs`</userinput></screen> - - <para>Second we will adjust the 64 bit ABI:</para> - -<screen><userinput>perl -pi -e 's@ /tools/lib/ld-linux-x86-64.so.2@ /lib/[EMAIL PROTECTED];' \ - -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' \ - `gcc --print-file specs`</userinput></screen> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="../x86/adjusting.xml" xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> Modified: branches/cross-lfs/BOOK/introduction/common/changelog.xml =================================================================== --- branches/cross-lfs/BOOK/introduction/common/changelog.xml 2005-09-02 19:09:27 UTC (rev 6796) +++ branches/cross-lfs/BOOK/introduction/common/changelog.xml 2005-09-02 19:09:38 UTC (rev 6797) @@ -39,6 +39,16 @@ --> <listitem> + <para>September 2, 2005</para> + <itemizedlist> + <listitem> + <para>[jim] - Specs adjustment works on GCC 4. Same expression for all Architectures, expect + for Alpha.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>September 1, 2005</para> <itemizedlist> <listitem> -- http://linuxfromscratch.org/mailman/listinfo/lfs-book FAQ: http://www.linuxfromscratch.org/lfs/faq.html Unsubscribe: See the above information page
