aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06/gcc.xml
diff options
context:
space:
mode:
authorDJ Lucas <dj@linuxfromscratch.org>2016-12-18 15:14:26 +0000
committerDJ Lucas <dj@linuxfromscratch.org>2016-12-18 15:14:26 +0000
commit98e7ac4cd781b87271d1ba1b90717de08023d4b7 (patch)
tree84ddf70f48d9f740fbc467ea4a3f0f1f02aabbf3 /chapter06/gcc.xml
parentbe3d9f313a25000d1cbaa631852be62330828f2c (diff)
Update toolchain sanity checks to use values for x86_64.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11155 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06/gcc.xml')
-rw-r--r--chapter06/gcc.xml37
1 files changed, 19 insertions, 18 deletions
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 6a75fb287..db34251fc 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -120,7 +120,8 @@ cd build</userinput></screen>
<userinput>grep -A7 Summ</userinput>.</para>
<para>Results can be compared with those located at <ulink
- url="&test-results;"/> and <ulink url="http://gcc.gnu.org/ml/gcc-testresults/"/>.</para>
+ url="&test-results;"/> and
+ <ulink url="http://gcc.gnu.org/ml/gcc-testresults/"/>.</para>
<para>A few unexpected failures cannot always be avoided. The GCC developers
are usually aware of these issues, but have not resolved them yet.
@@ -179,9 +180,9 @@ ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so \
href="adjusting.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen><computeroutput>/usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/../../../crt1.o succeeded
-/usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/../../../crti.o succeeded
-/usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/../../../crtn.o succeeded</computeroutput></screen>
+<screen><computeroutput>/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crt1.o succeeded
+/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crti.o succeeded
+/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crtn.o succeeded</computeroutput></screen>
<para>Depending on your machine architecture, the above may differ slightly,
the difference usually being the name of the directory
@@ -201,9 +202,9 @@ ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so \
xpointer="xpointer(//*[@os='h'])"/>
<screen><computeroutput>#include &lt;...&gt; search starts here:
- /usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/include
+ /usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include
/usr/local/include
- /usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/include-fixed
+ /usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include-fixed
/usr/include</computeroutput></screen>
<para>Again, note that the directory named after your target triplet may be
@@ -226,23 +227,23 @@ ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so \
href="adjusting.xml"
xpointer="xpointer(//*[@os='k'])"/>
-<screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib32")
-SEARCH_DIR("/usr/local/lib32")
-SEARCH_DIR("/lib32")
-SEARCH_DIR("/usr/lib32")
-SEARCH_DIR("/usr/i686-pc-linux-gnu/lib")
+<screen><computeroutput>SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib64")
+SEARCH_DIR("/usr/local/lib64")
+SEARCH_DIR("/lib64")
+SEARCH_DIR("/usr/lib64")
+SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib")
SEARCH_DIR("/usr/local/lib")
SEARCH_DIR("/lib")
SEARCH_DIR("/usr/lib");</computeroutput></screen>
- <para>A 64-bit system may see a few different directories. For example, here
- is the output from an x86_64 machine:</para>
+ <para>A 32-bit system may see a few different directories. For example, here
+ is the output from an i686 machine:</para>
-<screen><computeroutput>SEARCH_DIR("/usr/x86_64-unknown-linux-gnu/lib64")
-SEARCH_DIR("/usr/local/lib64")
-SEARCH_DIR("/lib64")
-SEARCH_DIR("/usr/lib64")
-SEARCH_DIR("/usr/x86_64-unknown-linux-gnu/lib")
+<screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib32")
+SEARCH_DIR("/usr/local/lib32")
+SEARCH_DIR("/lib32")
+SEARCH_DIR("/usr/lib32")
+SEARCH_DIR("/usr/i686-pc-linux-gnu/lib")
SEARCH_DIR("/usr/local/lib")
SEARCH_DIR("/lib")
SEARCH_DIR("/usr/lib");</computeroutput></screen>