Build binutils without crosstool-ng

Author: jwnrt

.github/workflows/toolchain_build.yml

@@ -73,6 +73,12 @@ jobs:
           echo Creating artifact staging directory...
           mkdir "$ARTIFACT_STAGING_DIR"
 
+      - name: Build Binutils
+        run: |
+          ./build-binutils.sh \
+            "${{ matrix.target }}" \
+            "${{ matrix.output_dir }}"
+
       - name: Build GCC toolchain
         run: |
           ./build-gcc-with-args.sh \

build-binutils.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+
+## build-binutils.sh
+#
+# Builds:
+# - GNU Binutils, GDB
+#
+# Then:
+# - Creates a tar file of the whole install directory
+
+set -e -o pipefail
+
+repo_dir="$(git rev-parse --show-toplevel)"
+build_dir="${repo_dir}/build"
+patch_dir="${repo_dir}/patches"
+
+source "${repo_dir}/sw-versions.sh"
+
+if [ "$#" -ne 2 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+  echo "USAGE: $0 <target> <dist dir>"    >&2
+  echo                                    >&2
+  echo "EXAMPLE:"                         >&2
+  echo "  $0 riscv32 dist/"               >&2
+  exit 1
+fi
+
+target="$1"
+
+# Double check the arch part of the target tuple.
+target_arch="${target/%-*}"
+if [ "$target_arch" != "riscv32" ] && [ "$target_arch" != "riscv64" ]; then
+  echo "Error: unsupported target '${target}'"  >&2
+  echo                                          >&2
+  echo "Supported arches are: riscv32, riscv64" >&2
+  exit 1
+fi
+
+set -x
+
+dist_dir="$(realpath "$2")"
+mkdir -p "$dist_dir"
+
+mkdir -p "$build_dir"
+cd "$build_dir"
+
+if [ ! -d binutils ]; then
+  git clone "$BINUTILS_URL" binutils \
+    --branch "$BINUTILS_BRANCH" \
+    --depth 1
+fi
+
+cd binutils
+git reset --hard
+git checkout "$BINUTILS_COMMIT"
+git apply "${patch_dir}/binutils/"*
+
+mkdir -p build
+cd build
+
+# NOTE: We don't want to require `libexpat` to be dynamically linked.
+# It turns out to be quite hard to statically link *only* `libexpat`.
+../configure \
+  --target "$target" \
+  --program-prefix="$target-" \
+  --prefix "$dist_dir" \
+  --with-expat=no
+
+make -j "$(nproc)"
+make install

lowrisc-toolchain-gcc-rv32imcb.config

@@ -58,14 +58,6 @@ CT_PREFIX_DIR="/tools/riscv"
 # Don't chmod the CT_PREFIX_DIR read-only after the install.
 # CT_PREFIX_DIR_RO is not set
 
-# Binutils 2.35, RISC-V bitmanip fork (branch riscv-binutils-2.35-rvb,
-# commit 7c9dd840fb from 2021-03-10).
-# A bitmanip 1.0+0.93 patch will be applied on top.
-CT_BINUTILS_SRC_DEVEL=y
-CT_BINUTILS_DEVEL_VCS_git=y
-CT_BINUTILS_DEVEL_URL="https://github.com/riscv-collab/riscv-binutils-gdb.git"
-CT_BINUTILS_DEVEL_REVISION="7c9dd840fbb6a1171a51feb08afb859288615137"
-
 # GCC 10.2.0, RISC-V bitmanip fork (branch riscv-gcc-10.2.0-rvb,
 # commit 73055647d33 from 2021-07-09)
 CT_GCC_SRC_DEVEL=y

lowrisc-toolchain-gcc-rv64imac.config

@@ -46,12 +46,6 @@ CT_PREFIX_DIR="/tools/riscv"
 # Don't chmod the CT_PREFIX_DIR read-only after the install.
 # CT_PREFIX_DIR_RO is not set
 
-# Binutils 2.35 (tag binutils-2_35, commit 2cb5c79dad3)
-CT_BINUTILS_SRC_DEVEL=y
-CT_BINUTILS_DEVEL_VCS_git=y
-CT_BINUTILS_DEVEL_URL="https://github.com/bminor/binutils-gdb.git"
-CT_BINUTILS_DEVEL_REVISION="2cb5c79dad39dd438fb0f7372ac04cf5aa2a7db7"
-
 # GCC 10.2.0 (tag releases/gcc-10.2.0, commit ee5c3db6c5b)
 CT_GCC_SRC_DEVEL=y
 CT_GCC_DEVEL_VCS_git=y

…binutils/git-7c9dd840/001-bitmanip.patch patches/binutils/001-bitmanip.patchpatches/lowrisc-toolchain-gcc-rv32imcb/binutils/git-7c9dd840/001-bitmanip.patch renamed to patches/binutils/001-bitmanip.patch patches/lowrisc-toolchain-gcc-rv32imcb/binutils/git-7c9dd840/001-bitmanip.patch renamed to patches/binutils/001-bitmanip.patch

@@ -1,5 +1,5 @@
 diff --git a/gnulib/import/glob.c b/gnulib/import/glob.c
-index 1bfcafb..9947f24 100644
+index f1b20d4869..b10bea1d9f 100644
 --- a/gnulib/import/glob.c
 +++ b/gnulib/import/glob.c
 @@ -21,7 +21,7 @@
@@ -12,13 +12,13 @@ index 1bfcafb..9947f24 100644
  #endif
 
 diff --git a/gnulib/import/libc-config.h b/gnulib/import/libc-config.h
-index e3571ee..44c3d0f 100644
+index 124f1d77e0..f1e9f59c81 100644
 --- a/gnulib/import/libc-config.h
 +++ b/gnulib/import/libc-config.h
-@@ -189,3 +189,7 @@
+@@ -181,3 +181,7 @@
+ /* A substitute for glibc <shlib-compat.h>, good enough for Gnulib.  */
  #define SHLIB_COMPAT(lib, introduced, obsoleted) 0
- #define compat_symbol(lib, local, symbol, version) extern int dummy
- #define versioned_symbol(lib, local, symbol, version) extern int dummy
+ #define versioned_symbol(lib, local, symbol, version)
 +
 +#ifndef __THROWNL
 +#define __THROWNL __THROW

…2imc/gdb/11.1/001-glob-libc-config.patch …ches/binutils/001-glob-libc-config.patchpatches/lowrisc-toolchain-gcc-rv32imc/gdb/11.1/001-glob-libc-config.patch renamed to patches/binutils/001-glob-libc-config.patch patches/lowrisc-toolchain-gcc-rv32imc/gdb/11.1/001-glob-libc-config.patch renamed to patches/binutils/001-glob-libc-config.patch

@@ -17,3 +17,8 @@ export QEMU_VERSION=23967e5b2a6c6d04b8db766a8a149f3631a7b899
 export LLVM_URL=https://github.com/lowRISC/llvm-project.git
 export LLVM_BRANCH=ot-llvm-16-hardening
 export LLVM_VERSION=dec908d48facb6041c12b95b8ade64719a894917
+
+# RISC-V fork of Binutils 2.35 with bitmanip instruction support
+export BINUTILS_URL=https://github.com/riscv-collab/riscv-binutils-gdb.git
+export BINUTILS_BRANCH=riscv-binutils-2.35-rvb
+export BINUTILS_COMMIT=7c9dd840fbb6a1171a51feb08afb859288615137