From cb2e27f8e479b84303f41842e687b0c0874db152 Mon Sep 17 00:00:00 2001
From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
Date: Wed, 10 Feb 2021 14:17:25 +0100
Subject: [PATCH] riscv: Fix link errors for Genode nightly

- add .got filter rule for trace policies, otherwise ld raises a
  segmentation fault
- force soft-float for binary sources (SRC_BIN)

issue #4012
---
 repos/base/mk/spec/riscv.mk             | 3 +++
 repos/os/src/lib/trace/policy/policy.ld | 1 +
 2 files changed, 4 insertions(+)

diff --git a/repos/base/mk/spec/riscv.mk b/repos/base/mk/spec/riscv.mk
index d60c630d9c..0da71ca32e 100644
--- a/repos/base/mk/spec/riscv.mk
+++ b/repos/base/mk/spec/riscv.mk
@@ -1,5 +1,8 @@
 SPECS       += 64bit
 REP_INC_DIR += include/spec/riscv
 
+# force soft-float for binutiles
+AS_OPT += -march rv64imac -mabi=lp64
+
 include $(BASE_DIR)/mk/spec/64bit.mk
 
diff --git a/repos/os/src/lib/trace/policy/policy.ld b/repos/os/src/lib/trace/policy/policy.ld
index db66c4b332..4a5e7bbdbb 100644
--- a/repos/os/src/lib/trace/policy/policy.ld
+++ b/repos/os/src/lib/trace/policy/policy.ld
@@ -8,6 +8,7 @@ SECTIONS {
 		*(.text .text.*)
 		*(.bss)
 		*(.got.plt)
+		*(.got)
 	} : rw
 
 	/DISCARD/ : { *(.*) }