brcm2708-gpu-fw: update to latest version

[openwrt/openwrt.git] / scripts / ext-toolchain.sh

diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh
index 257e0d8e82cade034e6771120ea31709460a3b2c..09390c5e0d51f5195f776507593a29a48d77c614 100755 (executable)
--- a/scripts/ext-toolchain.sh
+++ b/scripts/ext-toolchain.sh
@@ -3,7 +3,7 @@
 #   Script for various external toolchain tasks, refer to
 #   the --help output for more information.
 #
-#   Copyright (C) 2012 Jo-Philipp Wich <jow@openwrt.org>
+#   Copyright (C) 2012 Jo-Philipp Wich <jo@mein.io>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -91,7 +91,7 @@ test_uclibc() {
        local sysroot="$("$CC" $CFLAGS -print-sysroot 2>/dev/null)"
        if [ -d "${sysroot:-$TOOLCHAIN}" ]; then
                local lib
-               for lib in "${sysroot:-$TOOLCHAIN}"/{lib,usr/lib,usr/local/lib}/ld-uClibc*.so*; do
+               for lib in "${sysroot:-$TOOLCHAIN}"/{lib,usr/lib,usr/local/lib}/ld*-uClibc*.so*; do
                        if [ -f "$lib" ] && [ ! -h "$lib" ]; then
                                return 0
                        fi
@@ -197,6 +197,47 @@ find_bins() {
 }
 
 
+wrap_bin_cc() {
+       local out="$1"
+       local bin="$2"
+
+       echo    '#!/bin/sh'                                                > "$out"
+       echo    'for arg in "$@"; do'                                     >> "$out"
+       echo    ' case "$arg" in -l*|-L*|-shared|-static)'                >> "$out"
+       echo -n '  exec "'"$bin"'" '"$CFLAGS"' ${STAGING_DIR:+'           >> "$out"
+       echo -n '-idirafter "$STAGING_DIR/usr/include" '                  >> "$out"
+       echo -n '-L "$STAGING_DIR/usr/lib" '                              >> "$out"
+       echo    '-Wl,-rpath-link,"$STAGING_DIR/usr/lib"} "$@" ;;'         >> "$out"
+       echo    ' esac'                                                   >> "$out"
+       echo    'done'                                                    >> "$out"
+       echo -n 'exec "'"$bin"'" '"$CFLAGS"' ${STAGING_DIR:+'             >> "$out"
+       echo    '-idirafter "$STAGING_DIR/usr/include"} "$@"'             >> "$out"
+
+       chmod +x "$out"
+}
+
+wrap_bin_ld() {
+       local out="$1"
+       local bin="$2"
+
+       echo    '#!/bin/sh'                                                > "$out"
+       echo -n 'exec "'"$bin"'" ${STAGING_DIR:+'                         >> "$out"
+       echo -n '-L "$STAGING_DIR/usr/lib" '                              >> "$out"
+       echo    '-rpath-link "$STAGING_DIR/usr/lib"} "$@"'                >> "$out"
+
+       chmod +x "$out"
+}
+
+wrap_bin_other() {
+       local out="$1"
+       local bin="$2"
+
+       echo    '#!/bin/sh'                                                > "$out"
+       echo    'exec "'"$bin"'" "$@"'                                    >> "$out"
+
+       chmod +x "$out"
+}
+
 wrap_bins() {
        if probe_cc; then
                mkdir -p "$1" || return 1
@@ -205,28 +246,24 @@ wrap_bins() {
                for cmd in "${CC%-*}-"*; do
                        if [ -x "$cmd" ]; then
                                local out="$1/${cmd##*/}"
+                               local bin="$cmd"
+
+                               if [ -x "$out" ] && ! grep -q STAGING_DIR "$out"; then
+                                       mv "$out" "$out.bin"
+                                       bin='$(dirname "$0")/'"${out##*/}"'.bin'
+                               fi
 
-                               echo '#!/bin/sh' > "$out"
                                case "${cmd##*/}" in
                                        *-*cc|*-*cc-*|*-*++|*-*++-*|*-cpp)
-                                               echo -n 'exec "'"$cmd"'" '"$CFLAGS"' '         >> "$out"
-                                               echo -n '${STAGING_DIR:+-idirafter '           >> "$out"
-                                               echo -n '"$STAGING_DIR/usr/include" '          >> "$out"
-                                               echo -n '-L "$STAGING_DIR/usr/lib" '           >> "$out"
-                                               echo -n '-Wl,-rpath-link,'                     >> "$out"
-                                               echo    '"$STAGING_DIR/usr/lib"} "$@"'         >> "$out"
+                                               wrap_bin_cc "$out" "$bin"
                                        ;;
                                        *-ld)
-                                               echo -n 'exec "'"$cmd"'" ${STAGING_DIR:+'      >> "$out"
-                                               echo -n '-L "$STAGING_DIR/usr/lib" '           >> "$out"
-                                               echo -n '-rpath-link '                         >> "$out"
-                                               echo    '"$STAGING_DIR/usr/lib"} "$@"'         >> "$out"
+                                               wrap_bin_ld "$out" "$bin"
                                        ;;
                                        *)
-                                               echo "exec '$cmd' \"\$@\"" >> "$out"
+                                               wrap_bin_other "$out" "$bin"
                                        ;;
                                esac
-                               chmod +x "$out"
                        fi
                done
 
@@ -319,6 +356,10 @@ print_config() {
        echo "CONFIG_TOOLCHAIN_PREFIX=\"$prefix\"" >> "$config"
        echo "CONFIG_TARGET_NAME=\"$target\"" >> "$config"
 
+       if [ "$LIBC_TYPE" != glibc ]; then
+               echo "CONFIG_TOOLCHAIN_LIBC=\"$LIBC_TYPE\"" >> "$config"
+       fi
+
        local lib
        for lib in C RT PTHREAD GCC STDCPP SSP GFORTRAN; do
                local file