Index: head/lib/libc/arm/aeabi/aeabi_vfp.h
===================================================================
--- head/lib/libc/arm/aeabi/aeabi_vfp.h	(revision 354699)
+++ head/lib/libc/arm/aeabi/aeabi_vfp.h	(revision 354700)
@@ -1,131 +1,131 @@
 /*
  * Copyright (C) 2013 Andrew Turner
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  *
  */
 
 #ifndef AEABI_VFP_H
 #define	AEABI_VFP_H
 
 #include <machine/acle-compat.h>
 
 /*
  * ASM helper macros. These allow the functions to be changed depending on
  * the endian-ness we are building for.
  */
 
 /* Allow the name of the function to be changed depending on the ABI */
 #ifndef __ARM_PCS_VFP
 #define	AEABI_ENTRY(x)	ENTRY(__aeabi_ ## x ## _vfp)
 #define	AEABI_END(x)	END(__aeabi_ ## x ## _vfp)
 #else
 #define	AEABI_ENTRY(x)	ENTRY(__aeabi_ ## x)
 #define	AEABI_END(x)	END(__aeabi_ ## x)
 #endif
 
 /*
  * These should be used when a function either takes, or returns a floating
  * point falue. They will load the data from an ARM to a VFP register(s),
  * or from a VFP to an ARM register
  */
 #ifdef __ARM_BIG_ENDIAN
 #define	LOAD_DREG(vreg, reg0, reg1)   vmov vreg, reg1, reg0
 #define	UNLOAD_DREG(reg0, reg1, vreg) vmov reg1, reg0, vreg
 #else
 #define	LOAD_DREG(vreg, reg0, reg1)   vmov vreg, reg0, reg1
 #define	UNLOAD_DREG(reg0, reg1, vreg) vmov reg0, reg1, vreg
 #endif
 
 #define	LOAD_SREGS(vreg0, vreg1, reg0, reg1) vmov vreg0, vreg1, reg0, reg1
 #define	LOAD_SREG(vreg, reg)                 vmov vreg, reg
 #define	UNLOAD_SREG(reg, vreg)               vmov reg, vreg
 
 /*
  * C Helper macros
  */
 
-#if __ARM_ARCH >= 6
+#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
 /*
  * Generate a function that will either call into the VFP implementation,
  * or the soft float version for a given __aeabi_* helper. The function
  * will take a single argument of the type given by in_type.
  */
 #define	AEABI_FUNC(name, in_type, soft_func)			\
 __aeabi_ ## name(in_type a)					\
 {								\
 	if (_libc_arm_fpu_present)				\
 		return __aeabi_ ## name ## _vfp(a);		\
 	else							\
 		return soft_func (a);				\
 }
 
 /* As above, but takes two arguments of the same type */
 #define	AEABI_FUNC2(name, in_type, soft_func)			\
 __aeabi_ ## name(in_type a, in_type b)				\
 {								\
 	if (_libc_arm_fpu_present)				\
 		return __aeabi_ ## name ## _vfp(a, b);	\
 	else							\
 		return soft_func (a, b);			\
 }
 
 /* As above, but with the soft float arguments reversed */
 #define	AEABI_FUNC2_REV(name, in_type, soft_func)		\
 __aeabi_ ## name(in_type a, in_type b)				\
 {								\
 	if (_libc_arm_fpu_present)				\
 		return __aeabi_ ## name ## _vfp(a, b);	\
 	else							\
 		return soft_func (b, a);			\
 }
 #else
 /*
  * Helper macros for when we are only able to use the softfloat
  * version of these functions, i.e. on arm before armv6.
  */
 #define	AEABI_FUNC(name, in_type, soft_func)			\
 __aeabi_ ## name(in_type a)					\
 {								\
 	return soft_func (a);					\
 }
 
 /* As above, but takes two arguments of the same type */
 #define	AEABI_FUNC2(name, in_type, soft_func)			\
 __aeabi_ ## name(in_type a, in_type b)				\
 {								\
 	return soft_func (a, b);				\
 }
 
 /* As above, but with the soft float arguments reversed */
 #define	AEABI_FUNC2_REV(name, in_type, soft_func)		\
 __aeabi_ ## name(in_type a, in_type b)				\
 {								\
 	return soft_func (b, a);				\
 }
 #endif
 
 #endif
 
Index: head/lib/libc/arm/gen/_setjmp.S
===================================================================
--- head/lib/libc/arm/gen/_setjmp.S	(revision 354699)
+++ head/lib/libc/arm/gen/_setjmp.S	(revision 354700)
@@ -1,138 +1,138 @@
 /*	$NetBSD: _setjmp.S,v 1.12 2013/04/19 13:45:45 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by Mark Brinicombe
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #if !defined(__SOFTFP__) && !defined(__VFP_FP__) && !defined(__ARM_PCS)
 #error FPA is not supported anymore
 #endif
 
 #if !defined(_STANDALONE)
 	.fpu	vfp
 #endif
 
 #include <machine/asm.h>
 #include <machine/setjmp.h>
 
 __FBSDID("$FreeBSD$");
 
 /*
  * C library -- _setjmp, _longjmp
  *
  *	_longjmp(a,v)
  * will generate a "return(v)" from the last call to
  *	_setjmp(a)
  * by restoring registers from the stack.
  * The previous signal state is NOT restored.
  *
  * Note: r0 is the return value
  *       r1-r3,ip are scratch registers in functions
  */
 
 ENTRY(_setjmp)
 	ldr	r1, .L_setjmp_magic
 
-#if !defined(_STANDALONE) && __ARM_ARCH >= 6
+#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
 	add	r2, r0, #(_JB_REG_D8 * 4)
 	vstmia	r2, {d8-d15}
 	vmrs	r2, fpscr
 	str	r2, [r0, #(_JB_REG_FPSCR * 4)]
 #endif /* !_STANDALONE && __ARM_ARCH >= 6 */
 
 	str	r1, [r0]
 
 	add	r0, r0, #(_JB_REG_R4 * 4)
 	/* Store integer registers */
 #ifndef __thumb__
         stmia	r0, {r4-r14}
 #else
 	stmia	r0, {r4-r12}
 	str	r13, [r0, #((_JB_REG_R13 - _JB_REG_R4) * 4)]
 	str	r14, [r0, #((_JB_REG_R14 - _JB_REG_R4) * 4)]
 #endif
 
         mov	r0, #0x00000000
 	RET
 END(_setjmp)
 
 .L_setjmp_magic:
 	.word	_JB_MAGIC__SETJMP
 
 WEAK_ALIAS(___longjmp, _longjmp)
 ENTRY(_longjmp)
 	ldr	r2, [r0]			/* get magic from jmp_buf */
 	ldr	ip, .L_setjmp_magic		/* load magic */
 	teq	ip, r2				/* magic correct? */
 	bne	botch				/*   no, botch */
 
-#if !defined(_STANDALONE) && __ARM_ARCH >= 6
+#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
 	add	ip, r0, #(_JB_REG_D8 * 4)
 	vldmia	ip, {d8-d15}
 	ldr	ip, [r0, #(_JB_REG_FPSCR * 4)]
 	vmsr	fpscr, ip
 #endif /* !_STANDALONE && __ARM_ARCH >= 6 */
 
 	add	r0, r0, #(_JB_REG_R4 * 4)
        	/* Restore integer registers */
 #ifndef __thumb__
         ldmia	r0, {r4-r14}
 #else
 	ldmia	r0, {r4-r12}
 	ldr	r13, [r0, #((_JB_REG_R13 - _JB_REG_R4) * 4)]
 	ldr	r14, [r0, #((_JB_REG_R14 - _JB_REG_R4) * 4)]
 #endif
 
 	/* Validate sp and r14 */
 	teq	sp, #0
 	it	ne
 	teqne	r14, #0
 	it	eq
 	beq	botch
 
 	/* Set return value */
 	movs	r0, r1
 	it	eq
 	moveq	r0, #0x00000001
 	RET
 
 	/* validation failed, die die die. */
 botch:
 #if !defined(_STANDALONE)
 	bl	PIC_SYM(_C_LABEL(longjmperror), PLT)
 	bl	PIC_SYM(_C_LABEL(abort), PLT)
 1:	b	1b		/* Cannot get here */
 #else
 	b	.
 #endif
 END(_longjmp)
 
 	.section .note.GNU-stack,"",%progbits
Index: head/lib/libc/arm/gen/setjmp.S
===================================================================
--- head/lib/libc/arm/gen/setjmp.S	(revision 354699)
+++ head/lib/libc/arm/gen/setjmp.S	(revision 354700)
@@ -1,145 +1,145 @@
 /*	$NetBSD: setjmp.S,v 1.14 2013/04/19 13:45:45 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by Mark Brinicombe
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #if !defined(__SOFTFP__) && !defined(__VFP_FP__) && !defined(__ARM_PCS)
 #error FPA is not supported anymore
 #endif
 
 	.fpu	vfp
 
 #include <machine/asm.h>
 #include <machine/setjmp.h>
 
 __FBSDID("$FreeBSD$");
 
 /*
  * C library -- setjmp, longjmp
  *
  *	longjmp(a,v)
  * will generate a "return(v)" from the last call to
  *	setjmp(a)
  * by restoring registers from the stack.
  * The previous signal state is restored.
  */
 
 ENTRY(setjmp)
 	/* Block all signals and retrieve the old signal mask */
 	stmfd	sp!, {r0, r14}
 	add	r2, r0, #(_JB_SIGMASK * 4)	/* oset */
 	mov	r1, #0x00000000			/* set */
 	mov	r0, #0x00000001			/* SIG_BLOCK */
 	bl	PIC_SYM(_C_LABEL(sigprocmask), PLT)
 	ldmfd	sp!, {r0, r14}
 
 	ldr	r1, .Lsetjmp_magic
 
-#if __ARM_ARCH >= 6
+#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
 	add	r2, r0, #(_JB_REG_D8 * 4)
 	vstmia	r2, {d8-d15}
 	vmrs	r2, fpscr
 	str	r2, [r0, #(_JB_REG_FPSCR * 4)]
 #endif
 
 	str	r1, [r0]		/* store magic */
 
 	/* Store integer registers */
 	add	r0, r0, #(_JB_REG_R4 * 4)
 #ifndef __thumb__
         stmia	r0, {r4-r14}
 #else
 	stmia	r0, {r4-r12}
 	str	r13, [r0, #((_JB_REG_R13 - _JB_REG_R4) * 4)]
 	str	r14, [r0, #((_JB_REG_R14 - _JB_REG_R4) * 4)]
 #endif
         mov	r0, #0x00000000
 	RET
 
 .Lsetjmp_magic:
 	.word	_JB_MAGIC_SETJMP
 END(setjmp)
 
 .weak _C_LABEL(longjmp)
 .set _C_LABEL(longjmp), _C_LABEL(__longjmp)
 ENTRY(__longjmp)
 	ldr	r2, [r0]
 	ldr	ip, .Lsetjmp_magic
 	teq	r2, ip
 	bne	.Lbotch
 
 	/* Restore the signal mask. */
 	stmfd	sp!, {r0-r2, r14}
 	mov	r2, #0x00000000
 	add	r1, r0, #(_JB_SIGMASK * 4)	/* Signal mask */
 	mov	r0, #3				/* SIG_SETMASK */
 	bl	PIC_SYM(_C_LABEL(sigprocmask), PLT)
 	ldmfd	sp!, {r0-r2, r14}
 
-#if __ARM_ARCH >= 6
+#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
 	add	ip, r0, #(_JB_REG_D8 * 4)
 	vldmia	ip, {d8-d15}
 	ldr	ip, [r0, #(_JB_REG_FPSCR * 4)]
 	vmsr	fpscr, ip
 #endif
 
 	add	r0, r0, #(_JB_REG_R4 * 4)
 	/* Restore integer registers */
 #ifndef __thumb__
         ldmia	r0, {r4-r14}
 #else
         ldmia	r0, {r4-r12}
 	ldr	r13, [r0, #((_JB_REG_R13 - _JB_REG_R4) * 4)]
 	ldr	r14, [r0, #((_JB_REG_R14 - _JB_REG_R4) * 4)]
 #endif
 
 	/* Validate sp and r14 */
 	teq	sp, #0
 	it	ne
 	teqne	r14, #0
 	it	eq
 	beq	.Lbotch
 
 	/* Set return value */
 	movs	r0, r1
 	it	eq
 	moveq	r0, #0x00000001
 	RET
 
 	/* validation failed, die die die. */
 .Lbotch:
 	bl	PIC_SYM(_C_LABEL(longjmperror), PLT)
 	bl	PIC_SYM(_C_LABEL(abort), PLT)
 1:	b	1b		/* Cannot get here */
 END(__longjmp)
 
 	.section .note.GNU-stack,"",%progbits