Changeset 3e828ea in mainline for tools/toolchain.sh

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• tools/toolchain.sh (modified) (16 diffs)

tools/toolchain.sh

@@ -1 @@
-#! /bin/bash
+#!/bin/sh
 
 #
@@ -66 +66 @@
         echo " amd64      AMD64 (x86-64, x64)"
         echo " arm32      ARM 32b"
+        echo " arm64      AArch64"
         echo " ia32       IA-32 (x86, i386)"
         echo " ia64       IA-64 (Itanium)"
@@ -102 +103 @@
         echo
         
-        if [ -z "$1" ] || [ "$1" == "all" ] ; then
-                PLATFORMS=("amd64" "arm32" "ia32" "ia64" "mips32" "mips32eb" "ppc32" "riscv64" "sparc64")
+        if [ -z "$1" ] || [ "$1" = "all" ] ; then
+                PLATFORMS='amd64 arm32 arm64 ia32 ia64 mips32 mips32eb ppc32 riscv64 sparc64'
         else
-                PLATFORMS=("$1")
+                PLATFORMS="$1"
         fi
         
@@ -113 +114 @@
         fi
 
-        for i in "${PLATFORMS[@]}"
+        for i in $PLATFORMS
         do
                 PLATFORM="$i"
@@ -120 +121 @@
 
                 echo "== $PLATFORM =="
-                test_app_version "Binutils" "ld" "GNU\ ld\ \(GNU\ Binutils\)\ ((\.|[0-9])+)" "$BINUTILS_VERSION"
-                test_app_version "GCC" "gcc" "gcc\ version\ ((\.|[0-9])+)" "$GCC_VERSION"
-                test_app_version "GDB" "gdb" "GNU\ gdb\ \(GDB\)\s+((\.|[0-9])+)" "$GDB_VERSION"
+                test_app_version "Binutils" "ld" "GNU ld (.*) \([.0-9]*\)" "$BINUTILS_VERSION"
+                test_app_version "GCC" "gcc" "gcc version \([.0-9]*\)" "$GCC_VERSION"
+                test_app_version "GDB" "gdb" "GNU gdb (.*)[[:space:]]\+\([.0-9]*\)" "$GDB_VERSION"
         done
 
@@ -139 +140 @@
                 echo "- $PKGNAME is missing"
         else
-                {
-                        OUT=$(${APP} -v 2>&1)
-                } &> /dev/null
-
-                if [[ "$OUT" =~ $REGEX ]]; then
-                VERSION="${BASH_REMATCH[1]}"
-                if [ "$INS_VERSION" = "$VERSION" ]; then
-                        echo "+ $PKGNAME is uptodate ($INS_VERSION)"
-                else
-                        echo "- $PKGNAME ($VERSION) is outdated ($INS_VERSION)"
-                fi
-            else
-                echo "- $PKGNAME Unexpected output"
-            fi
+                VERSION=`${APP} -v 2>&1 | sed -n "s:^${REGEX}.*:\1:p"`
+
+                if [ -z "$VERSION" ]; then
+                        echo "- $PKGNAME Unexpected output"
+                        return 1
+                fi
+
+                if [ "$INS_VERSION" = "$VERSION" ]; then
+                        echo "+ $PKGNAME is uptodate ($INS_VERSION)"
+                else
+                        echo "- $PKGNAME ($VERSION) is outdated ($INS_VERSION)"
+                fi
         fi
 }
@@ -159 +158 @@
 
 change_title() {
-        echo -en "\e]0;$1\a"
+        printf "\e]0;$1\a"
 }
 
@@ -170 +169 @@
         fi
 
-        echo -n "${TM} "
+        printf "${TM} "
         change_title "${TM}"
         sleep 1
@@ -221 +220 @@
         OUTSIDE="$1"
         BASE="$2"
-        ORIGINAL="`pwd`"
+        ORIGINAL="$PWD"
+
+        cd "${BASE}"
+        check_error $? "Unable to change directory to ${BASE}."
+        ABS_BASE="$PWD"
+        cd "${ORIGINAL}"
+        check_error $? "Unable to change directory to ${ORIGINAL}."
 
         mkdir -p "${OUTSIDE}"
-
         cd "${OUTSIDE}"
         check_error $? "Unable to change directory to ${OUTSIDE}."
-        ABS_OUTSIDE="`pwd`"
-
-        cd "${BASE}"
-        check_error $? "Unable to change directory to ${BASE}."
-        ABS_BASE="`pwd`"
+
+        while [ "${#PWD}" -gt "${#ABS_BASE}" ]; do
+                cd ..
+        done
+
+        if [ "$PWD" = "$ABS_BASE" ]; then
+                echo
+                echo "CROSS_PREFIX cannot reside within the working directory."
+
+                exit 5
+        fi
 
         cd "${ORIGINAL}"
         check_error $? "Unable to change directory to ${ORIGINAL}."
-
-        BASE_LEN="${#ABS_BASE}"
-        OUTSIDE_TRIM="${ABS_OUTSIDE:0:${BASE_LEN}}"
-
-        if [ "${OUTSIDE_TRIM}" == "${ABS_BASE}" ] ; then
-                echo
-                echo "CROSS_PREFIX cannot reside within the working directory."
-
-                exit 5
-        fi
 }
 
@@ -275 +275 @@
                 "arm32")
                         GNU_ARCH="arm"
+                        ;;
+                "arm64")
+                        GNU_ARCH="aarch64"
                         ;;
                 "ia32")
@@ -341 +344 @@
                 mkdir -p "${WORKDIR}/sysroot/include"
                 mkdir "${WORKDIR}/sysroot/lib"
+                ARCH="$PLATFORM"
+                if [ "$ARCH" = "mips32eb" ]; then
+                        ARCH=mips32
+                fi
+
                 cp -r -L -t "${WORKDIR}/sysroot/include" \
                         ${SRCDIR}/../abi/include/* \
-                        ${SRCDIR}/../uspace/lib/c/arch/${PLATFORM}/include/* \
+                        ${SRCDIR}/../uspace/lib/c/arch/${ARCH}/include/* \
                         ${SRCDIR}/../uspace/lib/c/include/*
                 check_error $? "Failed to create build sysroot."
@@ -497 +505 @@
                 test_version
                 ;;
-        amd64|arm32|ia32|ia64|mips32|mips32eb|ppc32|riscv64|sparc64)
+        amd64|arm32|arm64|ia32|ia64|mips32|mips32eb|ppc32|riscv64|sparc64)
                 prepare
                 build_target "$1"
@@ -505 +513 @@
                 build_target "amd64"
                 build_target "arm32"
+                build_target "arm64"
                 build_target "ia32"
                 build_target "ia64"
@@ -517 +526 @@
                 build_target "amd64"
                 build_target "arm32"
+                build_target "arm64"
                 build_target "ia32"
                 build_target "ia64"
@@ -528 +538 @@
                 build_target "amd64" &
                 build_target "arm32" &
+                build_target "arm64" &
                 build_target "ia32" &
                 build_target "ia64" &
@@ -543 +554 @@
                 wait
 
+                build_target "arm64" &
                 build_target "ia32" &
+                wait
+
                 build_target "ia64" &
+                build_target "mips32" &
                 wait
 
-                build_target "mips32" &
                 build_target "mips32eb" &
+                build_target "ppc32" &
                 wait
 
-                build_target "ppc32" &
                 build_target "riscv64" &
-                wait
-
                 build_target "sparc64" &
                 wait