Merge pull request #259 from jkloetzke/toolchain-updates

Toolchain updates

Author: jkloetzke

.codespellrc

@@ -1,2 +1,3 @@
 [codespell]
 skip = */config.guess,*.diff,*.patch
+ignore-words-list = SME, sme

README.md

@@ -41,7 +41,7 @@ which use the `basement` layer. They act as smoke tests for this project.
 First you need to add the `basement` layer to your project. To do so, add a
 `layers` entry to `config.yaml`:
 
-    bobMinimumVersion: "0.25"
+    bobMinimumVersion: "1.0"
     layers:
         - name: basement
           scm: git
@@ -86,6 +86,8 @@ as you like.
 * `devel::cross-toolchain-arm-none-eabi`: ARMv7 bare metal toolchain with
   newlib libc.
 * `devel::cross-toolchain-x86_64-linux-gnu`: x86_64 toolchain for Linux with glibc.
+* `devel::cross-toolchain-riscv64-linux-gnu`: RISC-V toolchain targeting the GC
+  profile.
 
 To use a cross compiling toolchain include it where needed via:
 

aliases/libs/libc.yaml

@@ -0,0 +1,2 @@
+multiPackage:
+    tgt: "libs::libc-$(libc-flavour,$(get-tool-env,target-toolchain,AUTOCONF_HOST))-tgt"

classes/sandbox-toolchain.yaml …ses/basement/bits/sandbox-toolchain.yamlclasses/sandbox-toolchain.yaml renamed to classes/basement/bits/sandbox-toolchain.yaml classes/sandbox-toolchain.yaml renamed to classes/basement/bits/sandbox-toolchain.yaml

@@ -51,6 +51,21 @@ provideTools:
     host-toolchain: "."
     target-toolchain: &target-toolchain
         path: "."
+        environment:
+            # Default tool names.
+            AR: "ar"
+            AS: "as"
+            CC: "gcc"
+            CPP: "cpp"
+            CXX: "g++"
+            GDB: "gdb"
+            LD: "ld"
+            NM: "nm"
+            OBJCOPY: "objcopy"
+            OBJDUMP: "objdump"
+            RANLIB: "ranlib"
+            READELF: "readelf"
+            STRIP: "strip"
         fingerprintIf: True
         fingerprintScript: |
             # required for sandbox where gcc is not in PATH
@@ -61,8 +76,7 @@ provideTools:
     host-native-toolchain: *target-toolchain
 
 provideVars:
-    # Define our own build- and host-architecture. They are distinct from the
-    # host environment so that the "right thing"(tm) is done even though the
-    # architecture is the same.
+    # Define our own build-architecture. It is distinct from the host
+    # environment so that our toolchain is used and nothing is mixed with the
+    # host compiler.
     AUTOCONF_BUILD: "${SANDBOX_AUTOCONF_BUILD}"
-    AUTOCONF_HOST:  "${SANDBOX_AUTOCONF_HOST}"

classes/sandbox.yaml classes/basement/bits/sandbox.yamlclasses/sandbox.yaml renamed to classes/basement/bits/sandbox.yaml

@@ -43,7 +43,7 @@ buildSetup: |
     ${VS_PATH:+export PATH="$PATH:$VS_PATH"}
 
     # Gather all include and library paths.
-    if [[ $AUTOCONF_HOST == *-win32 ]] ; then
+    if [[ ${AUTOCONF_HOST:-$AUTOCONF_BUILD} == *-win32 ]] ; then
         for i in "${@:2}" ; do
             if [[ -d "$i/usr/include" ]] ; then
                 CPPFLAGS+=" -I $(cygpath -w "$i/usr/include")"

classes/cpackage.yaml

@@ -0,0 +1,41 @@
+buildSetup: |
+    # $1: option (e.g. ENABLE_FOO)
+    # $2: replacement (e.g. "ENABLE_FOO=y" or "# ENABLE_FOO is not set")
+    # $3: kconfig-file (optional, defaults to ".config")
+    kconfigUpdate()
+    {
+        sed -e "/^# $1 is not set/d" -e "/^$1=/d" -i "${3:-.config}"
+        echo "$2" >> "${3:-.config}"
+    }
+
+    # $1: option
+    # $2: kconfig-file (optional, defaults to ".config")
+    kconfigEnable()
+    {
+        kconfigUpdate "$1" "$1=y" "${2:-.config}"
+    }
+
+    # $1: option
+    # $2: kconfig-file (optional, defaults to ".config")
+    kconfigDisable()
+    {
+        kconfigUpdate "$1" "# $1 is not set" "${2:-.config}"
+    }
+
+    # $1: option
+    # $2: value ("n" or "0" -> disable, "y" or "1" -> enable)
+    # $3: kconfig-file (optional, defaults to ".config")
+    kconfigSetBool()
+    {
+        case "$2" in
+            n|0)
+                kconfigDisable "$1" "${3:-.config}"
+                ;;
+            y|1)
+                kconfigEnable "$1" "${3:-.config}"
+                ;;
+            *)
+                echo "kconfigSetBool: invalid value '$2'" >&2
+                exit 1
+        esac
+    }

classes/kconfig.yaml

@@ -55,6 +55,14 @@ buildSetup: |
                 MESON_CPU_FAMILY=x86
                 : ${MESON_CPU=i686}
                 ;;
+            riscv32-*)
+                MESON_CPU_FAMILY=riscv32
+                : ${MESON_CPU=rv32gc}
+                ;;
+            riscv64-*)
+                MESON_CPU_FAMILY=riscv64
+                : ${MESON_CPU=rv64gc}
+                ;;
             x86_64-*)
                 MESON_CPU_FAMILY=x86_64
                 : ${MESON_CPU=x86_64}

classes/meson.yaml

@@ -1,4 +1,4 @@
-bobMinimumVersion: "0.25"
+bobMinimumVersion: "1.0"
 
 plugins:
     - multiarch

config.yaml

@@ -14,30 +14,13 @@ environment:
     # should not be overridden by the user.
     ##########################################################################
 
-    # The default build (i.e. the system that the build runs on) and host
-    # system (i.e. the system where the produced executables run on)
+    # The default build system triplet (i.e. the system that the build runs on)
     # definition.
     ARCH:           "$(host-arch)"
     AUTOCONF_BUILD: "$(host-autoconf)"
-    AUTOCONF_HOST:  "$(host-autoconf)"
-
-    # Default tool names.
-    AR: "ar"
-    AS: "as"
-    CC: "gcc"
-    CPP: "cpp"
-    CXX: "g++"
-    GDB: "gdb"
-    LD: "ld"
-    NM: "nm"
-    OBJCOPY: "objcopy"
-    OBJDUMP: "objdump"
-    RANLIB: "ranlib"
-    READELF: "readelf"
-    STRIP: "strip"
 
     # Default host compilation flags. Only cross-compiling target toolchains
-    # will override these based on the BASEMENT_OPTIMIZE and BASEMENT_OPTIMIZE
+    # will override these based on the BASEMENT_DEBUG and BASEMENT_OPTIMIZE
     # settings above.
     #
     # We build everything static on host builds without debug symbols. Some
@@ -50,6 +33,7 @@ environment:
 
 archiveAppend:
     backend: http
+    name: ci.bobbuildtool.dev
     url: http://ci.bobbuildtool.dev/artifacts/
     flags: [download]