From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <iains@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1698)
 id BEE23385780A; Mon, 11 Oct 2021 20:34:59 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BEE23385780A
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Iain D Sandoe <iains@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/users/iains/heads/d-for-darwin)] d: Implement
 __traits(getTargetInfo)
X-Act-Checkin: gcc
X-Git-Author: Iain Buclaw <ibuclaw@gdcproject.org>
X-Git-Refname: refs/users/iains/heads/d-for-darwin
X-Git-Oldrev: f7074e857b103a6d6b5c8951d3fd4870ff33affc
X-Git-Newrev: 2d2b98c454ffe8822aa2ef38f94df344e8ade030
Message-Id: <20211011203459.BEE23385780A@sourceware.org>
Date: Mon, 11 Oct 2021 20:34:59 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Oct 2021 20:34:59 -0000

https://gcc.gnu.org/g:2d2b98c454ffe8822aa2ef38f94df344e8ade030

commit 2d2b98c454ffe8822aa2ef38f94df344e8ade030
Author: Iain Buclaw <ibuclaw@gdcproject.org>
Date:   Fri Dec 4 23:04:21 2020 +0100

    d: Implement __traits(getTargetInfo)

Diff:
---
 gcc/config/arm/arm-d.c | 11 ++++-------
 gcc/d/dmd/traits.c     |  1 +
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gcc/config/arm/arm-d.c b/gcc/config/arm/arm-d.c
index 5f43ef9b179..485b1b4d20a 100644
--- a/gcc/config/arm/arm-d.c
+++ b/gcc/config/arm/arm-d.c
@@ -38,15 +38,12 @@ arm_d_target_versions (void)
       d_add_builtin_version ("ARM_Thumb");
     }
 
-  if (TARGET_HARD_FLOAT_ABI)
+  if (arm_float_abi == ARM_FLOAT_ABI_HARD)
     d_add_builtin_version ("ARM_HardFloat");
-  else
-    {
-      if (TARGET_SOFT_FLOAT)
-	d_add_builtin_version ("ARM_SoftFloat");
-      else if (TARGET_HARD_FLOAT)
+  else if (arm_float_abi == ARM_FLOAT_ABI_SOFT)
+    d_add_builtin_version ("ARM_SoftFloat");
+  else if (arm_float_abi == ARM_FLOAT_ABI_SOFTFP)
 	d_add_builtin_version ("ARM_SoftFP");
-    }
 
   if (TARGET_SOFT_FLOAT)
     d_add_builtin_version ("D_SoftFloat");
diff --git a/gcc/d/dmd/traits.c b/gcc/d/dmd/traits.c
index 5a9f58b79f5..98cb6e4d48b 100644
--- a/gcc/d/dmd/traits.c
+++ b/gcc/d/dmd/traits.c
@@ -31,6 +31,7 @@
 #include "module.h"
 #include "attrib.h"
 #include "parse.h"
+#include "target.h"
 #include "root/speller.h"
 #include "target.h"