Module Name: src
Committed By: matt
Date: Wed Aug 1 06:02:13 UTC 2012
Modified Files:
src/lib/libc/arch/arm/gen: _setjmp.S setjmp.S
Log Message:
Add #error cases in case someone tries to compile hardfloat VFP libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/arm/gen/_setjmp.S
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/arm/gen/setjmp.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/gen/_setjmp.S
diff -u src/lib/libc/arch/arm/gen/_setjmp.S:1.6 src/lib/libc/arch/arm/gen/_setjmp.S:1.7
--- src/lib/libc/arch/arm/gen/_setjmp.S:1.6 Sat Aug 21 11:20:10 2004
+++ src/lib/libc/arch/arm/gen/_setjmp.S Wed Aug 1 06:02:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.6 2004/08/21 11:20:10 rearnsha Exp $ */
+/* $NetBSD: _setjmp.S,v 1.7 2012/08/01 06:02:13 matt Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -53,6 +53,8 @@ ENTRY(_setjmp)
str r1, [r0], #4
#ifdef SOFTFLOAT
add r0, r0, #52
+#elif defined(__VFP_FP__)
+#error _setjmp VFP support missing
#else
/* Store fp registers */
sfm f4, 4, [r0], #48
@@ -77,6 +79,8 @@ ENTRY(_longjmp)
#ifdef SOFTFLOAT
add r0, r0, #52
+#elif defined(__VFP_FP__)
+#error _longjmp VFP support missing
#else
/* Restore fp registers */
lfm f4, 4, [r0], #48
Index: src/lib/libc/arch/arm/gen/setjmp.S
diff -u src/lib/libc/arch/arm/gen/setjmp.S:1.8 src/lib/libc/arch/arm/gen/setjmp.S:1.9
--- src/lib/libc/arch/arm/gen/setjmp.S:1.8 Sun Oct 16 17:26:24 2005
+++ src/lib/libc/arch/arm/gen/setjmp.S Wed Aug 1 06:02:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: setjmp.S,v 1.8 2005/10/16 17:26:24 christos Exp $ */
+/* $NetBSD: setjmp.S,v 1.9 2012/08/01 06:02:13 matt Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -59,6 +59,8 @@ ENTRY(__setjmp14)
#ifdef SOFTFLOAT
add r0, r0, #52
+#elif defined(__VFP_FP__)
+#error __setjmp14 VFP support missing
#else
/* Store fp registers */
sfm f4, 4, [r0], #48
@@ -92,6 +94,8 @@ ENTRY(__longjmp14)
add r0, r0, #4
#ifdef SOFTFLOAT
add r0, r0, #52
+#elif defined(__VFP_FP__)
+#error __longjmp14 VFP support missing
#else
/* Restore fp registers */
lfm f4, 4, [r0], #48