From cc0ea39e14854396cb462dc85bff4d01e515bed7 Mon Sep 17 00:00:00 2001
From: ibuclaw <ibuclaw@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 2 May 2019 16:38:08 +0000
Subject: [PATCH] libphobos: RISC-V: Fix soft-float build errors with IEEE
 exception flags

libphobos/ChangeLog:

	* std/math.d (IeeeFlags.getIeeeFlags): Handle RISC-V soft-float ABI.
	(IeeeFlags.resetIeeeFlags): Likewise.
	(FloatingPointControl.getControlState): Likewise.
	(FloatingPointControl.setControlState): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@270815 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libphobos/ChangeLog      |  7 ++++++
 libphobos/src/std/math.d | 46 ++++++++++++++++++++++++++++------------
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index 0d937e02bfce..780e30430ba7 100644
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,3 +1,10 @@
+2019-05-02  Maciej Rozycki  <macro@wdc.com>
+
+	* std/math.d (IeeeFlags.getIeeeFlags): Handle RISC-V soft-float ABI.
+	(IeeeFlags.resetIeeeFlags): Likewise.
+	(FloatingPointControl.getControlState): Likewise.
+	(FloatingPointControl.setControlState): Likewise.
+
 2019-04-25  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	PR d/90250
diff --git a/libphobos/src/std/math.d b/libphobos/src/std/math.d
index 7e6a97f1dcdc..ff1633abf77c 100644
--- a/libphobos/src/std/math.d
+++ b/libphobos/src/std/math.d
@@ -4767,12 +4767,17 @@ private:
             }
             else version (RISCV_Any)
             {
-                uint result = void;
-                asm pure nothrow @nogc
+                version (D_SoftFloat)
+                    return 0;
+                else
                 {
-                    "frflags %0" : "=r" result;
+                    uint result = void;
+                    asm pure nothrow @nogc
+                    {
+                        "frflags %0" : "=r" result;
+                    }
+                    return result;
                 }
-                return result;
             }
             else
                 assert(0, "Not yet supported");
@@ -4850,10 +4855,15 @@ private:
             }
             else version (RISCV_Any)
             {
-                uint newValues = 0x0;
-                asm pure nothrow @nogc
+                version (D_SoftFloat)
+                    return;
+                else
                 {
-                    "fsflags %0" : : "r" newValues;
+                    uint newValues = 0x0;
+                    asm pure nothrow @nogc
+                    {
+                        "fsflags %0" : : "r" newValues;
+                    }
                 }
             }
             else
@@ -5450,12 +5460,17 @@ private:
             }
             else version (RISCV_Any)
             {
-                ControlState cont;
-                asm pure nothrow @nogc
+                version (D_SoftFloat)
+                    return 0;
+                else
                 {
-                    "frcsr %0" : "=r" cont;
+                    ControlState cont;
+                    asm pure nothrow @nogc
+                    {
+                        "frcsr %0" : "=r" cont;
+                    }
+                    return cont;
                 }
-                return cont;
             }
             else
                 assert(0, "Not yet supported");
@@ -5544,9 +5559,14 @@ private:
             }
             else version (RISCV_Any)
             {
-                asm pure nothrow @nogc
+                version (D_SoftFloat)
+                    return;
+                else
                 {
-                    "fscsr %0" : : "r" (newState);
+                    asm pure nothrow @nogc
+                    {
+                        "fscsr %0" : : "r" (newState);
+                    }
                 }
             }
             else
-- 
2.39.2