crosstool-0.32-uclibc5.diff

做好的交叉编译工具链

+    for file in libc.so libpthread.so libgcc_s.so; do
+      for lib in lib lib64 usr/lib usr/lib64; do
+            if test -f ${SYSROOT}/$lib/$file && test ! -h ${SYSROOT}/$lib/$file; then
+                    mv ${SYSROOT}/$lib/$file ${SYSROOT}/$lib/${file}_orig
+                    if test -z "$USE_SYSROOT"; then
+                      sed 's,/usr/lib/,,g;s,/usr/lib64/,,g;s,/lib/,,g;s,/lib64/,,g;/BUG in libc.scripts.output-format.sed/d' < ${SYSROOT}/$lib/${file}_orig > ${SYSROOT}/$lib/$file
+                    else
+                      sed '/BUG in libc.scripts.output-format.sed/d' < ${SYSROOT}/$lib/${file}_orig > ${SYSROOT}/$lib/$file
+                    fi
+            fi
+        done
     done
-done
+
+  ;;
+
+  uclibc)
+
+    # currently uClibc cannot be built offtree, so we copy the source 
+    cp -a ${LIBC_DIR}/* .
+ 
+    # Go find a .config, or make a new default one.
+    if test '!' -f .config; then
+      if test -f ../build-libc-headers/.config; then
+        cp ../build-libc-headers/.config .config
+      elif test -z "${UCLIBCCONFIG}"; then
+        if test -f ${LIBC_DIR}/.config; then
+          cp ${LIBC_DIR}/.config .config
+        else
+          defaultuClibcConfig
+        fi
+      else
+        cp ${UCLIBCCONFIG} .config
+      fi
+    fi
+   
+    correctuClibcConfig
+   
+    # uClibc uses the CROSS environment variable as a prefix to the
+    # compiler tools to use.  The newly built tools should be in our
+    # path, so we need only give the correct name for them.
+    CROSS=${TARGET}- PREFIX=${PREFIX}/${TARGET}/ make all install
+
+    ;;
+   
+esac
+  
 cd ..
 
 test -f ${SYSROOT}/lib/libc.a || test -f ${SYSROOT}/lib64/libc.a || test -f ${SYSROOT}/usr/lib/libc.a || test -f ${SYSROOT}/usr/lib64/libc.a || abort Building libc failed
@@ -472,18 +623,34 @@
     # only matters for gcc-3.2.x and later, I think
     # --disable-nls to work around crash bug on ppc405, but also because embedded
     # systems don't really need message catalogs...
+
+    GCC_DEFAULT_OPTIONS="--disable-nls \
+                         --enable-threads=posix \
+                         --enable-symvers=gnu \
+                         --enable-languages="$GCC_LANGUAGES" \
+                         --enable-shared \
+                         --enable-c99 \
+                         --enable-long-long"
+    case ${C_LIBRARY} in
+        glibc)
+            GCC_DEFAULT_OPTIONS="$GCC_DEFAULT_OPTIONS --enable-__cxa_atexit"
+            ;;
+        *)
+            GCC_DEFAULT_OPTIONS="$GCC_DEFAULT_OPTIONS --disable-__cxa_atexit"
+            ;;
+    esac
+    for GCC_DEFAULT_OPTION in $GCC_DEFAULT_OPTIONS ; do
+        GCC_SEARCH_OPTION=`echo "$GCC_DEFAULT_OPTION" | sed -e 's/^--en//' \
+            -e 's/^--dis//' -e 's/=.*//'`
+        if echo "$GCC_EXTRA_CONFIG" | grep -v "$GCC_SEARCH_OPTION"; then
+            GCC_EXTRA_CONFIG="$GCC_EXTRA_CONFIG $GCC_DEFAULT_OPTION"
+        fi
+    done
+
     ${GCC_DIR}/configure $CANADIAN_BUILD --target=$TARGET --host=$GCC_HOST --prefix=$PREFIX \
-        ${GCC_EXTRA_CONFIG} \
-        $GCC_SYSROOT_ARG \
-        --with-local-prefix=${SYSROOT} \
-        --disable-nls \
-        --enable-threads=posix \
-        --enable-symvers=gnu \
-        --enable-__cxa_atexit \
-        --enable-languages="$GCC_LANGUAGES" \
-         $SHARED_MODE \
-        --enable-c99 \
-        --enable-long-long
+      ${GCC_SYSROOT_ARG} \
+      --with-local-prefix=${SYSROOT} \
+      ${GCC_EXTRA_CONFIG}
 fi
 
 test "$CANADIAN_BUILD" = "" || make $PARALLELMFLAGS all-build-libiberty || true
diff -urN crosstool-0.32-orig/demo-arm-softfloat-uclibc.dat crosstool-0.32/demo-arm-softfloat-uclibc.dat
--- crosstool-0.32-orig/demo-arm-softfloat-uclibc.dat	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-0.32/demo-arm-softfloat-uclibc.dat	2005-05-08 11:01:05.000000000 +0200
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -ex
+TARBALLS_DIR=/ptx/src
+RESULT_TOP=/opt/crosstool
+export TARBALLS_DIR RESULT_TOP
+
+# FIXME RSC: c++ builds libstdc++v3 which breaks with uClibc...?
+#GCC_LANGUAGES="c,c++"
+GCC_LANGUAGES="c"
+export GCC_LANGUAGES
+
+# Really, you should do the mkdir before running this,
+# and chown /opt/crosstool to yourself so you don't need to run as root.
+mkdir -p $RESULT_TOP
+
+# Build the toolchain.  Takes a couple hours and a couple gigabytes.
+
+eval `cat arm-softfloat-uclibc.dat gcc-3.3.3-uclibc-0.9.27.dat` sh all.sh --notest
+
+echo Done.
diff -urN crosstool-0.32-orig/demo-m68k-uclibc.sh crosstool-0.32/demo-m68k-uclibc.sh
--- crosstool-0.32-orig/demo-m68k-uclibc.sh	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-0.32/demo-m68k-uclibc.sh	2005-05-08 11:01:05.000000000 +0200
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -ex
+TARBALLS_DIR=/ptx/src
+RESULT_TOP=/opt/crosstool
+export TARBALLS_DIR RESULT_TOP
+
+# FIXME RSC: c++ builds libstdc++v3 which breaks with uClibc...?
+#GCC_LANGUAGES="c,c++"
+GCC_LANGUAGES="c"
+export GCC_LANGUAGES
+
+# Really, you should do the mkdir before running this,
+# and chown /opt/crosstool to yourself so you don't need to run as root.
+mkdir -p $RESULT_TOP
+
+# Build the toolchain.  Takes a couple hours and a couple gigabytes.
+
+eval `cat m68k-uclibc.dat gcc-3.3.3-uclibc-0.9.27.dat` sh all.sh --notest
+
+echo Done.
diff -urN crosstool-0.32-orig/demoptx.sh crosstool-0.32/demoptx.sh
--- crosstool-0.32-orig/demoptx.sh	2005-03-08 01:34:33.000000000 +0100
+++ crosstool-0.32/demoptx.sh	2005-05-08 11:01:05.000000000 +0200
@@ -12,9 +12,11 @@
 #GCC_DIR=gcc-3.3.1
 GCC_DIR=gcc-2.95.3
 
-#GLIBC_DIR=glibc-2.3.2
-GLIBC_DIR=glibc-2.2.2
-#GLIBC_DIR=glibc-2.2.5
+#LIBC_DIR=glibc-2.3.2
+LIBC_DIR=glibc-2.2.2
+#LIBC_DIR=glibc-2.2.5
 
-export TARGET GCC_DIR GLIBC_DIR
+C_LIBRARY=glibc
+
+export TARGET GCC_DIR LIBC_DIR C_LIBRARY
 sh ptx.sh
diff -urN crosstool-0.32-orig/gcc-2.95.3-glibc-2.1.3.dat crosstool-0.32/gcc-2.95.3-glibc-2.1.3.dat
--- crosstool-0.32-orig/gcc-2.95.3-glibc-2.1.3.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-2.95.3-glibc-2.1.3.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,6 +1,7 @@
 BINUTILS_DIR=binutils-2.15
 GCC_DIR=gcc-2.95.3
-GLIBC_DIR=glibc-2.1.3
+LIBC_DIR=glibc-2.1.3
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.1.3
 GLIBCCRYPT_FILENAME=glibc-crypt-2.1
diff -urN crosstool-0.32-orig/gcc-2.95.3-glibc-2.2.2.dat crosstool-0.32/gcc-2.95.3-glibc-2.2.2.dat
--- crosstool-0.32-orig/gcc-2.95.3-glibc-2.2.2.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-2.95.3-glibc-2.2.2.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,5 +1,6 @@
 BINUTILS_DIR=binutils-2.15
 GCC_DIR=gcc-2.95.3
-GLIBC_DIR=glibc-2.2.2
+LIBC_DIR=glibc-2.2.2
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.2.2
diff -urN crosstool-0.32-orig/gcc-2.95.3-glibc-2.2.5.dat crosstool-0.32/gcc-2.95.3-glibc-2.2.5.dat
--- crosstool-0.32-orig/gcc-2.95.3-glibc-2.2.5.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-2.95.3-glibc-2.2.5.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,5 +1,6 @@
 BINUTILS_DIR=binutils-2.15
 GCC_DIR=gcc-2.95.3
-GLIBC_DIR=glibc-2.2.5
+LIBC_DIR=glibc-2.2.5
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.2.5
diff -urN crosstool-0.32-orig/gcc-3.2.3-glibc-2.2.3.dat crosstool-0.32/gcc-3.2.3-glibc-2.2.3.dat
--- crosstool-0.32-orig/gcc-3.2.3-glibc-2.2.3.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-3.2.3-glibc-2.2.3.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,5 +1,6 @@
 BINUTILS_DIR=binutils-2.15
 GCC_DIR=gcc-3.2.3
-GLIBC_DIR=glibc-2.2.3
+LIBC_DIR=glibc-2.2.3
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.2.3
diff -urN crosstool-0.32-orig/gcc-3.2.3-glibc-2.2.5.dat crosstool-0.32/gcc-3.2.3-glibc-2.2.5.dat
--- crosstool-0.32-orig/gcc-3.2.3-glibc-2.2.5.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-3.2.3-glibc-2.2.5.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,5 +1,6 @@
 BINUTILS_DIR=binutils-2.15
 GCC_DIR=gcc-3.2.3
-GLIBC_DIR=glibc-2.2.5
+LIBC_DIR=glibc-2.2.5
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.2.5
diff -urN crosstool-0.32-orig/gcc-3.2.3-glibc-2.3.2.dat crosstool-0.32/gcc-3.2.3-glibc-2.3.2.dat
--- crosstool-0.32-orig/gcc-3.2.3-glibc-2.3.2.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-3.2.3-glibc-2.3.2.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,5 +1,6 @@
 BINUTILS_DIR=binutils-2.15
 GCC_DIR=gcc-3.2.3
 LINUX_DIR=linux-2.4.26
-GLIBC_DIR=glibc-2.3.2
+LIBC_DIR=glibc-2.3.2
+C_LIBRARY=glibc
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.3.2
diff -urN crosstool-0.32-orig/gcc-3.3.1-glibc-2.2.5.dat crosstool-0.32/gcc-3.3.1-glibc-2.2.5.dat
--- crosstool-0.32-orig/gcc-3.3.1-glibc-2.2.5.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-3.3.1-glibc-2.2.5.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,5 +1,6 @@
 BINUTILS_DIR=binutils-2.14
 GCC_DIR=gcc-3.3.1
-GLIBC_DIR=glibc-2.2.5
+LIBC_DIR=glibc-2.2.5
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.2.5
diff -urN crosstool-0.32-orig/gcc-3.3.1-glibc-2.3.2.dat crosstool-0.32/gcc-3.3.1-glibc-2.3.2.dat
--- crosstool-0.32-orig/gcc-3.3.1-glibc-2.3.2.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-3.3.1-glibc-2.3.2.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,5 +1,6 @@
 BINUTILS_DIR=binutils-2.14
 GCC_DIR=gcc-3.3.1
-GLIBC_DIR=glibc-2.3.2
+LIBC_DIR=glibc-2.3.2
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.3.2
diff -urN crosstool-0.32-orig/gcc-3.3.2-glibc-2.3.2.dat crosstool-0.32/gcc-3.3.2-glibc-2.3.2.dat
--- crosstool-0.32-orig/gcc-3.3.2-glibc-2.3.2.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-3.3.2-glibc-2.3.2.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,5 +1,6 @@
 BINUTILS_DIR=binutils-2.15
 GCC_DIR=gcc-3.3.2
-GLIBC_DIR=glibc-2.3.2
+LIBC_DIR=glibc-2.3.2
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.3.2
diff -urN crosstool-0.32-orig/gcc-3.3.3-glibc-2.1.3.dat crosstool-0.32/gcc-3.3.3-glibc-2.1.3.dat
--- crosstool-0.32-orig/gcc-3.3.3-glibc-2.1.3.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-3.3.3-glibc-2.1.3.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,6 +1,7 @@
 BINUTILS_DIR=binutils-2.15
 GCC_DIR=gcc-3.3.3
-GLIBC_DIR=glibc-2.1.3
+LIBC_DIR=glibc-2.1.3
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.1.3
 GLIBCCRYPT_FILENAME=glibc-crypt-2.1
diff -urN crosstool-0.32-orig/gcc-3.3.3-glibc-2.2.5.dat crosstool-0.32/gcc-3.3.3-glibc-2.2.5.dat
--- crosstool-0.32-orig/gcc-3.3.3-glibc-2.2.5.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-3.3.3-glibc-2.2.5.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,5 +1,6 @@
 BINUTILS_DIR=binutils-2.15
 GCC_DIR=gcc-3.3.3
-GLIBC_DIR=glibc-2.2.5
+LIBC_DIR=glibc-2.2.5
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26
 GLIBCTHREADS_FILENAME=glibc-linuxthreads-2.2.5
diff -urN crosstool-0.32-orig/gcc-3.3.3-glibc-2.3.2.dat crosstool-0.32/gcc-3.3.3-glibc-2.3.2.dat
--- crosstool-0.32-orig/gcc-3.3.3-glibc-2.3.2.dat	2005-03-09 23:05:23.000000000 +0100
+++ crosstool-0.32/gcc-3.3.3-glibc-2.3.2.dat	2005-05-08 11:01:05.000000000 +0200
@@ -1,5 +1,6 @@
 BINUTILS_DIR=binutils-2.15
 GCC_DIR=gcc-3.3.3
-GLIBC_DIR=glibc-2.3.2
+LIBC_DIR=glibc-2.3.2
+C_LIBRARY=glibc
 LINUX_DIR=linux-2.4.26