r1534 - branches/Onward/temporary_system

robert at linuxfromscratch.org robert at linuxfromscratch.org
Sun Feb 14 13:01:46 PST 2010


Author: robert
Date: 2010-02-14 14:01:45 -0700 (Sun, 14 Feb 2010)
New Revision: 1534

Modified:
   branches/Onward/temporary_system/adjusting.txt
   branches/Onward/temporary_system/binutils_pass1.txt
Log:
Use make to install ld-new-pass1, because ld/ld-new is a shell script. Repaired the adjusting instructions for x86_64 and added more comments.

Modified: branches/Onward/temporary_system/adjusting.txt
===================================================================
--- branches/Onward/temporary_system/adjusting.txt	2010-02-14 19:08:18 UTC (rev 1533)
+++ branches/Onward/temporary_system/adjusting.txt	2010-02-14 21:01:45 UTC (rev 1534)
@@ -1,21 +1,34 @@
 # Temporary tools - Adjusting the toolchain
 
-# We need a generic (non-fpie/ssp/fortify_source) copy of the GCC specs for
-# test suites in the new system. This are -fPIC specs, but that's okay:
+# We need to save a generic (non-fpie/ssp/fortify_source) copy of the GCC specs
+# file for the test suites in the final system. These specs have -fPIC, but
+# that's okay:
 
 gcc -dumpspecs > /tools/gcc-pass1-specs &&
 
+# Replace the linker with the one we rebuilt earlier. This linker is hard coded
+# to link to /tools/lib:
+
 mv -v /tools/bin/{ld,ld-old-temp} &&
 cp -v /tools/bin/{ld-new-pass1,ld} &&
 
-gcc -dumpspecs | sed 's@/lib/ld-linux.so.2@/tools&@g' \
-  > `dirname $(gcc -print-libgcc-file-name)`/specs &&
+# Adjust the GCC specs to use /tools/lib and /tools/include:
 
+gcc -dumpspecs | sed \
+	-e 's@/lib\(64\)\?/ld@/tools&@g' \
+	-e "/^\*cpp:$/{n;s,$, -isystem /tools/include,}" \
+	> `dirname $(gcc -print-libgcc-file-name)`/specs &&
+
+# Remove any host system headers that may have been installed by the
+# GCC fixincludes script:
+
 GCC_INCLUDEDIR=`dirname $(gcc -print-libgcc-file-name)`/include &&
 find ${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; &&
 rm -vf `grep -l "DO NOT EDIT THIS FILE" ${GCC_INCLUDEDIR}/*` &&
 unset GCC_INCLUDEDIR &&
 
+# Now test the adjustments:
+
 echo 'main(){}' > dummy.c &&
 cc dummy.c &&
 readelf -l a.out | grep ': /tools' &&

Modified: branches/Onward/temporary_system/binutils_pass1.txt
===================================================================
--- branches/Onward/temporary_system/binutils_pass1.txt	2010-02-14 19:08:18 UTC (rev 1533)
+++ branches/Onward/temporary_system/binutils_pass1.txt	2010-02-14 21:01:45 UTC (rev 1534)
@@ -40,5 +40,5 @@
 
 make -C ld clean &&
 make -C ld LIB_PATH=/tools/lib &&
-install -v ld/ld-new /tools/bin/ld-new-pass1
+make -C ld/ EXEEXT=-new-pass1 install-exec-local
 




More information about the hlfs-book mailing list