Changeset bc73be3 in mainline for tools/toolchain.sh

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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.

Message:

cpp: merge and resolve conflicts

File:

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

tools/toolchain.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)"
@@ -103 +104 @@
         
         if [ -z "$1" ] || [ "$1" == "all" ] ; then
-                PLATFORMS=("amd64" "arm32" "ia32" "ia64" "mips32" "mips32eb" "ppc32" "riscv64" "sparc64")
+                PLATFORMS=("amd64" "arm32" "arm64" "ia32" "ia64" "mips32" "mips32eb" "ppc32" "riscv64" "sparc64")
         else
                 PLATFORMS=("$1")
@@ -275 +276 @@
                 "arm32")
                         GNU_ARCH="arm"
+                        ;;
+                "arm64")
+                        GNU_ARCH="aarch64"
                         ;;
                 "ia32")
@@ -497 +501 @@
                 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 +509 @@
                 build_target "amd64"
                 build_target "arm32"
+                build_target "arm64"
                 build_target "ia32"
                 build_target "ia64"
@@ -517 +522 @@
                 build_target "amd64"
                 build_target "arm32"
+                build_target "arm64"
                 build_target "ia32"
                 build_target "ia64"
@@ -528 +534 @@
                 build_target "amd64" &
                 build_target "arm32" &
+                build_target "arm64" &
                 build_target "ia32" &
                 build_target "ia64" &
@@ -543 +550 @@
                 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