r1242 - in trunk: . scripts/scripts/cross-scripts scripts/scripts/native-scripts scripts/scripts/target-scripts

ryan at linuxfromscratch.org ryan at linuxfromscratch.org
Fri Mar 10 02:06:14 PST 2006


Author: ryan
Date: 2006-03-10 03:06:12 -0700 (Fri, 10 Mar 2006)
New Revision: 1242

Modified:
   trunk/
   trunk/scripts/scripts/cross-scripts/cross-gcc-final.sh
   trunk/scripts/scripts/cross-scripts/cross-gcc-shared.sh
   trunk/scripts/scripts/cross-scripts/cross-gcc-static.sh
   trunk/scripts/scripts/native-scripts/native-gcc.sh
   trunk/scripts/scripts/target-scripts/target-gcc.sh
Log:
 r1292 at rei:  lfs | 2006-03-07 20:00:23 +1100
 gcc build script updates for gcc-4.1.0



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1290
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564
   + 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1292
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564

Modified: trunk/scripts/scripts/cross-scripts/cross-gcc-final.sh
===================================================================
--- trunk/scripts/scripts/cross-scripts/cross-gcc-final.sh	2006-03-10 01:28:14 UTC (rev 1241)
+++ trunk/scripts/scripts/cross-scripts/cross-gcc-final.sh	2006-03-10 10:06:12 UTC (rev 1242)
@@ -13,6 +13,17 @@
 
 LOG="gcc-cross-final.log"
 
+# we cannot assume what the default env for the the host system is,
+# so we just set libdirname to "lib"
+libdirname="lib"
+
+#set_libdirname
+#setup_multiarch
+#
+#if [ ! "${libdirname}" = "lib" ]; then
+#   extra_conf="--libdir=${HST_TOOLS}/${libdirname}"
+#fi
+
 if [ "Y" = "${MULTIARCH}" ]; then
    vendor_os=`echo ${TARGET} | sed 's@\([^-]*\)-\(.*\)@\2@'`
    case ${TGT_ARCH} in
@@ -38,7 +49,7 @@
 
 else
    # If we are not multi-arch, disable multilib
-   extra_conf="--enable-multilib=no"
+   extra_conf="${extra_conf} --enable-multilib=no"
 
    # HACK: this sets abi to n32 with mips... this should be handled
    # by the multiarch funcs somehow... and set according to DEFAULTENV
@@ -78,16 +89,21 @@
 # Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
 cd ${SRC}/${PKGDIR}
 case ${target_gcc_ver} in
-   3.4.3 ) apply_patch gcc-3.4.3-linkonce-1
-           apply_patch gcc-3.4.0-arm-bigendian
-           apply_patch gcc-3.4.0-arm-nolibfloat
-           apply_patch gcc-3.4.0-arm-lib1asm
-           apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
+   3.4.3 )
+      apply_patch gcc-3.4.3-linkonce-1
+      apply_patch gcc-3.4.0-arm-bigendian
+      apply_patch gcc-3.4.0-arm-nolibfloat
+      apply_patch gcc-3.4.0-arm-lib1asm
+      apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
    ;;
-   4.0.0 ) apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
-           apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
-           apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   4.0.0 )
+      apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
+      apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
+      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
    ;;
+   4.0.* | 4.1.* )
+      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
 esac
 
 # if we are using gcc-3.4x, set libexecdir to */${libdirname}

Modified: trunk/scripts/scripts/cross-scripts/cross-gcc-shared.sh
===================================================================
--- trunk/scripts/scripts/cross-scripts/cross-gcc-shared.sh	2006-03-10 01:28:14 UTC (rev 1241)
+++ trunk/scripts/scripts/cross-scripts/cross-gcc-shared.sh	2006-03-10 10:06:12 UTC (rev 1242)
@@ -80,16 +80,21 @@
 # Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
 cd ${SRC}/${PKGDIR}
 case ${target_gcc_ver} in
-   3.4.3 ) apply_patch gcc-3.4.3-linkonce-1
-           apply_patch gcc-3.4.0-arm-bigendian
-           apply_patch gcc-3.4.0-arm-nolibfloat
-           apply_patch gcc-3.4.0-arm-lib1asm
-           apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
+   3.4.3 )
+      apply_patch gcc-3.4.3-linkonce-1
+      apply_patch gcc-3.4.0-arm-bigendian
+      apply_patch gcc-3.4.0-arm-nolibfloat
+      apply_patch gcc-3.4.0-arm-lib1asm
+      apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
    ;;
-   4.0.0 ) apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
-           apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
-           apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   4.0.0 )
+      apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
+      apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
+      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
    ;;
+   4.0.* | 4.1.* )
+      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
 esac
 
 # if we are using gcc-3.4x, set libexecdir to */${libdirname}

Modified: trunk/scripts/scripts/cross-scripts/cross-gcc-static.sh
===================================================================
--- trunk/scripts/scripts/cross-scripts/cross-gcc-static.sh	2006-03-10 01:28:14 UTC (rev 1241)
+++ trunk/scripts/scripts/cross-scripts/cross-gcc-static.sh	2006-03-10 10:06:12 UTC (rev 1242)
@@ -77,16 +77,21 @@
 # Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
 cd ${SRC}/${PKGDIR}
 case ${target_gcc_ver} in
-   3.4.3 ) apply_patch gcc-3.4.3-linkonce-1
-           apply_patch gcc-3.4.0-arm-bigendian
-           apply_patch gcc-3.4.0-arm-nolibfloat
-           apply_patch gcc-3.4.0-arm-lib1asm
-           apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
+   3.4.3 )
+      apply_patch gcc-3.4.3-linkonce-1
+      apply_patch gcc-3.4.0-arm-bigendian
+      apply_patch gcc-3.4.0-arm-nolibfloat
+      apply_patch gcc-3.4.0-arm-lib1asm
+      apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
    ;;
-   4.0.0 ) apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
-           apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
-           apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   4.0.0 )
+      apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
+      apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
+      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
    ;;
+   4.0.* | 4.1.* )
+      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
 esac
 
 # if we are using gcc-3.4x, set libexecdir to */${libdirname}

Modified: trunk/scripts/scripts/native-scripts/native-gcc.sh
===================================================================
--- trunk/scripts/scripts/native-scripts/native-gcc.sh	2006-03-10 01:28:14 UTC (rev 1241)
+++ trunk/scripts/scripts/native-scripts/native-gcc.sh	2006-03-10 10:06:12 UTC (rev 1242)
@@ -82,14 +82,14 @@
       apply_patch gcc-3.4.0-arm-nolibfloat
       apply_patch gcc-3.4.0-arm-lib1asm
    ;;
-   4.0.1 | 4.1.* )
-      apply_patch gcc-4.0.0-remove_standard_startfile_prefix_from_startfile_prefixes-1
-   ;;
    4.0.0 )
       apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
       apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
       apply_patch gcc-4.0.0-remove_standard_startfile_prefix_from_startfile_prefixes-1
    ;;
+   4.0.* | 4.1.* )
+      apply_patch gcc-4.0.0-remove_standard_startfile_prefix_from_startfile_prefixes-1
+   ;;
 esac
 
 

Modified: trunk/scripts/scripts/target-scripts/target-gcc.sh
===================================================================
--- trunk/scripts/scripts/target-scripts/target-gcc.sh	2006-03-10 01:28:14 UTC (rev 1241)
+++ trunk/scripts/scripts/target-scripts/target-gcc.sh	2006-03-10 10:06:12 UTC (rev 1242)
@@ -90,18 +90,21 @@
 # Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
 cd ${SRC}/${PKGDIR}
 case ${target_gcc_ver} in
-   3.4.3 ) apply_patch gcc-3.4.3-linkonce-1
-           apply_patch gcc-3.4.0-arm-bigendian
-           apply_patch gcc-3.4.0-arm-nolibfloat
-           apply_patch gcc-3.4.0-arm-lib1asm
-           apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
+   3.4.3 )
+      apply_patch gcc-3.4.3-linkonce-1
+      apply_patch gcc-3.4.0-arm-bigendian
+      apply_patch gcc-3.4.0-arm-nolibfloat
+      apply_patch gcc-3.4.0-arm-lib1asm
+      apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
    ;;
-   4.0.0 ) apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
-           apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
-           apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   4.0.0 )
+      apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
+      apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
+      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
    ;;
-   4.0.* ) apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1 ;;
-   4.1.* ) apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1 ;;
+   4.0.* | 4.1.* )
+      apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
 esac
 
 # if we are using gcc-3.4x, set libexecdir to */${libdirname}




More information about the cross-lfs mailing list