Module Name: src
Committed By: matt
Date: Wed Aug 1 06:10:21 UTC 2012
Modified Files:
src/lib/libc/arch/arm/hardfloat: fpgetmask.S fpgetsticky.S fpsetmask.S
fpsetsticky.S
Log Message:
Error out if compiled with -mfp=vfp and -mhard-float
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/arm/hardfloat/fpgetmask.S \
src/lib/libc/arch/arm/hardfloat/fpgetsticky.S \
src/lib/libc/arch/arm/hardfloat/fpsetmask.S \
src/lib/libc/arch/arm/hardfloat/fpsetsticky.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/arm/hardfloat/fpgetmask.S
diff -u src/lib/libc/arch/arm/hardfloat/fpgetmask.S:1.4 src/lib/libc/arch/arm/hardfloat/fpgetmask.S:1.5
--- src/lib/libc/arch/arm/hardfloat/fpgetmask.S:1.4 Sat Aug 21 11:21:00 2004
+++ src/lib/libc/arch/arm/hardfloat/fpgetmask.S Wed Aug 1 06:10:21 2012
@@ -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 @@ ENTRY(_fpgetmask)
#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
Index: src/lib/libc/arch/arm/hardfloat/fpgetsticky.S
diff -u src/lib/libc/arch/arm/hardfloat/fpgetsticky.S:1.4 src/lib/libc/arch/arm/hardfloat/fpgetsticky.S:1.5
--- src/lib/libc/arch/arm/hardfloat/fpgetsticky.S:1.4 Sat Aug 21 11:21:00 2004
+++ src/lib/libc/arch/arm/hardfloat/fpgetsticky.S Wed Aug 1 06:10:21 2012
@@ -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 @@ ENTRY(_fpgetsticky)
#else
ENTRY(fpgetsticky)
#endif
+#ifdef __VFP_FP__
+#error _fpgetsticky VFP support missing
+#else
rfs r0
and r0, r0, #0x1f
RET
+#endif
Index: src/lib/libc/arch/arm/hardfloat/fpsetmask.S
diff -u src/lib/libc/arch/arm/hardfloat/fpsetmask.S:1.4 src/lib/libc/arch/arm/hardfloat/fpsetmask.S:1.5
--- src/lib/libc/arch/arm/hardfloat/fpsetmask.S:1.4 Sat Aug 21 11:21:00 2004
+++ src/lib/libc/arch/arm/hardfloat/fpsetmask.S Wed Aug 1 06:10:21 2012
@@ -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 @@ ENTRY(_fpsetmask)
#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 @@ ENTRY(fpsetmask)
wfs r0
mov r0, r1, lsr #16 /* Return old mask */
RET
+#endif
Index: src/lib/libc/arch/arm/hardfloat/fpsetsticky.S
diff -u src/lib/libc/arch/arm/hardfloat/fpsetsticky.S:1.4 src/lib/libc/arch/arm/hardfloat/fpsetsticky.S:1.5
--- src/lib/libc/arch/arm/hardfloat/fpsetsticky.S:1.4 Sat Aug 21 11:21:00 2004
+++ src/lib/libc/arch/arm/hardfloat/fpsetsticky.S Wed Aug 1 06:10:21 2012
@@ -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 @@ ENTRY(_fpsetsticky)
#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 @@ ENTRY(fpsetsticky)
wfs r0
mov r0, r1 /* Return old mask */
RET
+#endif
