summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbootstrap2
-rw-r--r--config/arch/riscv.in2
-rw-r--r--samples/riscv32-hifive1-elf/crosstool.config6
-rw-r--r--samples/riscv32-hifive1-elf/reported.by3
-rw-r--r--scripts/build/debug/300-gdb.sh22
5 files changed, 24 insertions, 11 deletions
diff --git a/bootstrap b/bootstrap
index e497467..a71a2b0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
if [ "${BASH_VERSINFO[0]}" -lt 4 ]; then
echo "Your BASH shell version (${BASH_VERSION}) is too old." >&2
diff --git a/config/arch/riscv.in b/config/arch/riscv.in
index e8c1297..4efde97 100644
--- a/config/arch/riscv.in
+++ b/config/arch/riscv.in
@@ -5,6 +5,8 @@
##
## select ARCH_SUPPORTS_32
## select ARCH_DEFAULT_32
+## select ARCH_SUPPORTS_WITH_ABI
+## select ARCH_SUPPORTS_WITH_ARCH
## select GCC_REQUIRE_7_or_later
## help The RISC-V architecture, as defined by:
diff --git a/samples/riscv32-hifive1-elf/crosstool.config b/samples/riscv32-hifive1-elf/crosstool.config
new file mode 100644
index 0000000..18f8870
--- /dev/null
+++ b/samples/riscv32-hifive1-elf/crosstool.config
@@ -0,0 +1,6 @@
+CT_EXPERIMENTAL=y
+CT_ARCH_RISCV=y
+CT_ARCH_ARCH="rv32ima"
+CT_ARCH_ABI="ilp32"
+CT_TARGET_VENDOR="hifive1"
+# CT_CC_GCC_LDBL_128 is not set
diff --git a/samples/riscv32-hifive1-elf/reported.by b/samples/riscv32-hifive1-elf/reported.by
new file mode 100644
index 0000000..291cc00
--- /dev/null
+++ b/samples/riscv32-hifive1-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Franz Flasch"
+reporter_url="https://github.com/franzflasch/crosstool-ng"
+reporter_comment=""
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index cf0da41..74744cc 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -96,16 +96,16 @@ do_debug_gdb_build() {
cross_LDFLAGS="${CT_LDFLAGS_FOR_HOST}"
if [ "${CT_GDB_CROSS_STATIC}" = "y" ]; then
- cross_CFLAGS+=("-static")
- cross_CXXFLAGS+=("-static")
- cross_LDFLAGS+=("-static")
+ cross_CFLAGS+=" -static"
+ cross_CXXFLAGS+=" -static"
+ cross_LDFLAGS+=" -static"
fi
case "${CT_HOST}" in
*darwin*)
# FIXME: Really, we should be testing for host compiler being clang.
- cross_CFLAGS+=("-Qunused-arguments")
- cross_CXXFLAGS+=("-Qunused-arguments")
+ cross_CFLAGS+=" -Qunused-arguments"
+ cross_CXXFLAGS+=" -Qunused-arguments"
# clang detects the line from gettext's _ macro as format string
# not being a string literal and produces a lot of warnings - which
# ct-ng's logger faithfully relays to user if this happens in the
@@ -245,9 +245,9 @@ do_debug_gdb_build() {
native_LDFLAGS="${CT_TARGET_LDFLAGS}"
if [ "${CT_GDB_NATIVE_STATIC}" = "y" ]; then
- native_CFLAGS+=("-static")
- native_CXXFLAGS+=("-static")
- native_LDFLAGS+=("-static")
+ native_CFLAGS+=" -static"
+ native_CXXFLAGS+=" -static"
+ native_LDFLAGS+=" -static"
fi
export ac_cv_func_strncmp_works=yes
@@ -345,11 +345,13 @@ do_debug_gdb_build() {
gdbserver_LDFLAGS="${CT_TARGET_LDFLAGS}"
if [ "${CT_GDB_GDBSERVER_STATIC}" = "y" ]; then
- gdbserver_LDFLAGS+=("-static")
+ gdbserver_CFLAGS+=" -static"
+ gdbserver_CXXFLAGS+=" -static"
+ gdbserver_LDFLAGS+=" -static"
fi
if [ "${CT_GDB_GDBSERVER_STATIC_LIBSTDCXX}" = "y" ]; then
- gdbserver_LDFLAGS+=("-static-libstdc++")
+ gdbserver_LDFLAGS+=" -static-libstdc++"
fi
gdbserver_CPPFLAGS=`echo ${gdbserver_CPPFLAGS}`