diff -r 5d234d9a257c -r 22b5ef41df97 scripts/build/cc_core_gcc.sh
--- a/scripts/build/cc_core_gcc.sh	Thu May 24 17:49:24 2007 +0000
+++ b/scripts/build/cc_core_gcc.sh	Sun May 27 20:22:06 2007 +0000
@@ -21,27 +21,47 @@
     CT_ExtractAndPatch "${CT_CC_CORE_FILE}"
 }
 
-# Build core gcc
-do_cc_core() {
-    mkdir -p "${CT_BUILD_DIR}/build-cc-core"
-    cd "${CT_BUILD_DIR}/build-cc-core"
+# Core gcc pass 1
+do_cc_core_pass_1() {
+    # In case we're NPTL, build the static core gcc;
+    # in any other case, do nothing.
+    case "${CT_THREADS}" in
+        nptl)   do_cc_core_static;;
+        *)      ;;
+    esac
+}
 
-    CT_DoStep INFO "Installing core C compiler"
+# Core gcc pass 2
+do_cc_core_pass_2() {
+    # In case we're NPTL, build the shared core gcc,
+    # in any other case, build the static core gcc.
+    case "${CT_THREADS}" in
+        nptl)   do_cc_core_shared;;
+        *)      do_cc_core_static;;
+    esac
+}
+
+# Build static core gcc
+do_cc_core_static() {
+    mkdir -p "${CT_BUILD_DIR}/build-cc-core-static"
+    cd "${CT_BUILD_DIR}/build-cc-core-static"
+
+    CT_DoStep INFO "Installing static core C compiler"
 
     CT_DoLog EXTRA "Copying headers to install area of bootstrap gcc, so it can build libgcc2"
-    mkdir -p "${CT_CC_CORE_PREFIX_DIR}/${CT_TARGET}/include"
-    cp -r "${CT_HEADERS_DIR}"/* "${CT_CC_CORE_PREFIX_DIR}/${CT_TARGET}/include" 2>&1 |CT_DoLog DEBUG
+    mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/include"
+    cp -r "${CT_HEADERS_DIR}"/* "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/include" 2>&1 |CT_DoLog DEBUG
 
-    CT_DoLog EXTRA "Configuring core C compiler"
+    CT_DoLog EXTRA "Configuring static core C compiler"
 
     extra_config=""
     [ "${CT_ARCH_FLOAT_SW}" = "y" ] && extra_config="${extra_config} --with-float=soft"
     [ -n "${CT_ARCH_ABI}" ]  && extra_config="${extra_config} --with-abi=${CT_ARCH_ABI}"
+    [ -n "${CT_ARCH_ARCH}" ] && extra_config="${extra_config} --with-arch=${CT_ARCH_ARCH}"
     [ -n "${CT_ARCH_CPU}" ]  && extra_config="${extra_config} --with-cpu=${CT_ARCH_CPU}"
     [ -n "${CT_ARCH_TUNE}" ] && extra_config="${extra_config} --with-tune=${CT_ARCH_TUNE}"
-    [ -n "${CT_ARCH_ARCH}" ] && extra_config="${extra_config} --with-arch=${CT_ARCH_ARCH}"
     [ -n "${CT_ARCH_FPU}" ] && extra_config="${extra_config} --with-fpu=${CT_ARCH_FPU}"
-    [ "${CT_CC_CXA_ATEXIT}" == "y" ] && extra_config="${extra_config} --enable-__cxa_atexit"
+    [ "${CT_CC_CXA_ATEXIT}" = "y" ] && extra_config="${extra_config} --enable-__cxa_atexit"
 
     CT_DoLog DEBUG "Extra config passed: \"${extra_config}\""
 
@@ -49,9 +69,9 @@
     CFLAGS="${CT_CFLAGS_FOR_HOST}"                  \
     "${CT_SRC_DIR}/${CT_CC_CORE_FILE}/configure"    \
         ${CT_CANADIAN_OPT}                          \
+        --host=${CT_HOST}                           \
         --target=${CT_TARGET}                       \
-        --host=${CT_HOST}                           \
-        --prefix="${CT_CC_CORE_PREFIX_DIR}"         \
+        --prefix="${CT_CC_CORE_STATIC_PREFIX_DIR}"  \
         --with-local-prefix="${CT_SYSROOT_DIR}"     \
         --disable-multilib                          \
         --with-newlib                               \
@@ -69,12 +89,102 @@
         make ${PARALLELMFLAGS} all-build-libiberty 2>&1 |CT_DoLog ALL
     fi
 
-    CT_DoLog EXTRA "Building core C compiler"
+    CT_DoLog EXTRA "Building static core C compiler"
     make ${PARALLELMFLAGS} all-gcc 2>&1 |CT_DoLog ALL
 
-    CT_DoLog EXTRA "Installing core C compiler"
+    CT_DoLog EXTRA "Installing static core C compiler"
     make install-gcc 2>&1 |CT_DoLog ALL
 
     CT_EndStep
 }
 
+# Build shared core gcc
+do_cc_core_shared() {
+    mkdir -p "${CT_BUILD_DIR}/build-cc-core-shared"
+    cd "${CT_BUILD_DIR}/build-cc-core-shared"
+
+    CT_DoStep INFO "Installing shared core C compiler"
+
+    CT_DoLog EXTRA "Copying headers to install area of bootstrap gcc, so it can build libgcc2"
+    mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/include"
+    cp -r "${CT_HEADERS_DIR}"/* "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/include" 2>&1 |CT_DoLog DEBUG
+
+    CT_DoLog EXTRA "Configuring shared core C compiler"
+
+    extra_config=""
+    [ "${CT_ARCH_FLOAT_SW}" = "y" ] && extra_config="${extra_config} --with-float=soft"
+    [ -n "${CT_ARCH_ABI}" ]  && extra_config="${extra_config} --with-abi=${CT_ARCH_ABI}"
+    [ -n "${CT_ARCH_ARCH}" ] && extra_config="${extra_config} --with-arch=${CT_ARCH_ARCH}"
+    [ -n "${CT_ARCH_CPU}" ]  && extra_config="${extra_config} --with-cpu=${CT_ARCH_CPU}"
+    [ -n "${CT_ARCH_TUNE}" ] && extra_config="${extra_config} --with-tune=${CT_ARCH_TUNE}"
+    [ -n "${CT_ARCH_FPU}" ] && extra_config="${extra_config} --with-fpu=${CT_ARCH_FPU}"
+    [ "${CT_CC_CXA_ATEXIT}" = "y" ] && extra_config="${extra_config} --enable-__cxa_atexit"
+
+    CT_DoLog DEBUG "Extra config passed: \"${extra_config}\""
+
+    CFLAGS="${CT_CFLAGS_FOR_HOST}"                  \
+    "${CT_SRC_DIR}/${CT_CC_CORE_FILE}/configure"    \
+        ${CT_CANADIAN_OPT}                          \
+        --target=${CT_TARGET}                       \
+        --host=${CT_HOST}                           \
+        --prefix="${CT_CC_CORE_SHARED_PREFIX_DIR}"  \
+        --with-local-prefix="${CT_SYSROOT_DIR}"     \
+        --disable-multilib                          \
+        ${CC_CORE_SYSROOT_ARG}                      \
+        ${extra_config}                             \
+        --disable-nls                               \
+        --enable-symvers=gnu                        \
+        --enable-languages=c                        \
+        --enable-shared                             \
+        ${CT_CC_CORE_EXTRA_CONFIG}                  2>&1 |CT_DoLog ALL
+
+    # HACK: we need to override SHLIB_LC from gcc/config/t-slibgcc-elf-ver or
+    # gcc/config/t-libunwind so -lc is removed from the link for
+    # libgcc_s.so, as we do not have a target -lc yet.
+    # This is not as ugly as it appears to be ;-) All symbols get resolved
+    # during the glibc build, and we provide a proper libgcc_s.so for the
+    # cross toolchain during the final gcc build.
+    #
+    # As we cannot modify the source tree, nor override SHLIB_LC itself
+    # during configure or make, we have to edit the resultant
+    # gcc/libgcc.mk itself to remove -lc from the link.
+    # This causes us to have to jump through some hoops...
+    #
+    # To produce libgcc.mk to edit we firstly require libiberty.a,
+    # so we configure then build it.
+    # Next we have to configure gcc, create libgcc.mk then edit it...
+    # So much easier if we just edit the source tree, but hey...
+    if [ ! -f "${CT_SRC_DIR}/${CT_CC_CORE_FILE}/gcc/BASE-VER" ]; then
+        make configure-libiberty
+        make -C libiberty libiberty.a
+        make configure-gcc
+        make configure-libcpp
+        make all-libcpp
+    else
+        make configure-gcc
+        make configure-libcpp
+        make configure-build-libiberty
+        make all-libcpp
+        make all-build-libiberty
+    fi 2>&1 |CT_DoLog ALL
+    # HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here.
+    if [ -d "${CT_SRC_DIR}/${CT_CC_CORE_FILE}/libdecnumber" ]; then
+        make configure-libdecnumber
+        make -C libdecnumber libdecnumber.a
+    fi 2>&1 |CT_DoLog ALL
+    make -C gcc libgcc.mk 2>&1 |CT_DoLog ALL
+    sed -r -i -e 's@-lc@@g' gcc/libgcc.mk
+
+    if [ "${CT_CANADIAN}" = "y" ]; then
+        CT_DoLog EXTRA "Building libiberty"
+        make ${PARALLELMFLAGS} all-build-libiberty 2>&1 |CT_DoLog ALL
+    fi
+
+    CT_DoLog EXTRA "Building shared core C compiler"
+    make ${PARALLELMFLAGS} all-gcc 2>&1 |CT_DoLog ALL
+
+    CT_DoLog EXTRA "Installing shared core C compiler"
+    make install-gcc 2>&1 |CT_DoLog ALL
+
+    CT_EndStep
+}