From 14b401f0bf784b88cf306822f19d6dbc219991d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
Date: Mon, 18 Nov 2019 21:17:02 -0500
Subject: [PATCH] target/riscv: rationalise softfloat includes

We should avoid including the whole of softfloat headers in cpu.h and
explicitly include it only where we will be calling softfloat
functions. We can use the -types.h and -helpers.h in cpu.h for the few
bits that are global.

Backports commit 135b03cb9defbd080b8834b30e3d45bed00c6137 from qemu
---
 qemu/target/riscv/cpu.c        | 1 +
 qemu/target/riscv/cpu.h        | 2 +-
 qemu/target/riscv/fpu_helper.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/qemu/target/riscv/cpu.c b/qemu/target/riscv/cpu.c
index f62df871..3e06e6b7 100644
--- a/qemu/target/riscv/cpu.c
+++ b/qemu/target/riscv/cpu.c
@@ -22,6 +22,7 @@
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "qapi/error.h"
+#include "fpu/softfloat-helpers.h"
 
 #include "uc_priv.h"
 
diff --git a/qemu/target/riscv/cpu.h b/qemu/target/riscv/cpu.h
index dc72b3e4..8e3cd183 100644
--- a/qemu/target/riscv/cpu.h
+++ b/qemu/target/riscv/cpu.h
@@ -25,7 +25,7 @@
 #include "qemu-common.h"
 #include "qom/cpu.h"
 #include "exec/cpu-defs.h"
-#include "fpu/softfloat.h"
+#include "fpu/softfloat-types.h"
 
 #define TCG_GUEST_DEFAULT_MO 0
 
diff --git a/qemu/target/riscv/fpu_helper.c b/qemu/target/riscv/fpu_helper.c
index b4f818a6..0b79562a 100644
--- a/qemu/target/riscv/fpu_helper.c
+++ b/qemu/target/riscv/fpu_helper.c
@@ -21,6 +21,7 @@
 #include "qemu/host-utils.h"
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"
+#include "fpu/softfloat.h"
 
 target_ulong riscv_cpu_get_fflags(CPURISCVState *env)
 {