[src/trunk]: src/lib/libc/arch/arm/hardfloat Error out if compiled with -mfp=...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ea797fe6f6d6
branches:  trunk
changeset: 780638:ea797fe6f6d6
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Aug 01 06:10:21 2012 +0000

description:
Error out if compiled with -mfp=vfp and -mhard-float

diffstat:

 lib/libc/arch/arm/hardfloat/fpgetmask.S   |  6 +++++-
 lib/libc/arch/arm/hardfloat/fpgetsticky.S |  6 +++++-
 lib/libc/arch/arm/hardfloat/fpsetmask.S   |  6 +++++-
 lib/libc/arch/arm/hardfloat/fpsetsticky.S |  6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diffs (89 lines):

diff -r b3170c4023a2 -r ea797fe6f6d6 lib/libc/arch/arm/hardfloat/fpgetmask.S
--- a/lib/libc/arch/arm/hardfloat/fpgetmask.S   Wed Aug 01 06:02:13 2012 +0000
+++ b/lib/libc/arch/arm/hardfloat/fpgetmask.S   Wed Aug 01 06:10:21 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fpgetmask.S,v 1.4 2004/08/21 11:21:00 rearnsha Exp $   */
+/*     $NetBSD: fpgetmask.S,v 1.5 2012/08/01 06:10:21 matt Exp $       */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -45,7 +45,11 @@
 #else
 ENTRY(fpgetmask)
 #endif
+#ifdef __VFP_FP__
+#error _fpgetmask VFP support missing
+#else
        rfs     r0
        mov     r0, r0, lsr #16
        and     r0, r0, #0x1f
        RET
+#endif
diff -r b3170c4023a2 -r ea797fe6f6d6 lib/libc/arch/arm/hardfloat/fpgetsticky.S
--- a/lib/libc/arch/arm/hardfloat/fpgetsticky.S Wed Aug 01 06:02:13 2012 +0000
+++ b/lib/libc/arch/arm/hardfloat/fpgetsticky.S Wed Aug 01 06:10:21 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fpgetsticky.S,v 1.4 2004/08/21 11:21:00 rearnsha Exp $ */
+/*     $NetBSD: fpgetsticky.S,v 1.5 2012/08/01 06:10:21 matt Exp $     */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -45,6 +45,10 @@
 #else
 ENTRY(fpgetsticky)
 #endif
+#ifdef __VFP_FP__
+#error _fpgetsticky VFP support missing
+#else
        rfs     r0
        and     r0, r0, #0x1f
        RET
+#endif
diff -r b3170c4023a2 -r ea797fe6f6d6 lib/libc/arch/arm/hardfloat/fpsetmask.S
--- a/lib/libc/arch/arm/hardfloat/fpsetmask.S   Wed Aug 01 06:02:13 2012 +0000
+++ b/lib/libc/arch/arm/hardfloat/fpsetmask.S   Wed Aug 01 06:10:21 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fpsetmask.S,v 1.4 2004/08/21 11:21:00 rearnsha Exp $   */
+/*     $NetBSD: fpsetmask.S,v 1.5 2012/08/01 06:10:21 matt Exp $       */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -45,6 +45,9 @@
 #else
 ENTRY(fpsetmask)
 #endif
+#ifdef __VFP_FP__
+#error _fpsetmask VFP support missing
+#else
        rfs     r1
        bic     r1, r1, #0x001f0000
        and     r0, r0, #0x0000001f
@@ -52,3 +55,4 @@
        wfs     r0
        mov     r0, r1, lsr #16         /* Return old mask */
        RET
+#endif
diff -r b3170c4023a2 -r ea797fe6f6d6 lib/libc/arch/arm/hardfloat/fpsetsticky.S
--- a/lib/libc/arch/arm/hardfloat/fpsetsticky.S Wed Aug 01 06:02:13 2012 +0000
+++ b/lib/libc/arch/arm/hardfloat/fpsetsticky.S Wed Aug 01 06:10:21 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fpsetsticky.S,v 1.4 2004/08/21 11:21:00 rearnsha Exp $ */
+/*     $NetBSD: fpsetsticky.S,v 1.5 2012/08/01 06:10:21 matt Exp $     */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -45,6 +45,9 @@
 #else
 ENTRY(fpsetsticky)
 #endif
+#ifdef __VFP_FP__
+#error _fpsetsticky VFP support missing
+#else
        rfs     r1
        bic     r1, r1, #0x1f
        and     r0, r0, #0x1f
@@ -52,3 +55,4 @@
        wfs     r0
        mov     r0, r1                  /* Return old mask */
        RET
+#endif