Index: head/lib/msun/i387/e_fmodf.S
===================================================================
--- head/lib/msun/i387/e_fmodf.S	(revision 305384)
+++ head/lib/msun/i387/e_fmodf.S	(revision 305385)
@@ -1,24 +1,20 @@
 /*
- * Based on the i387 version written by J.T. Conklin <jtc@netbsd.org>.
+ * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
  */
 
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$")
 
 ENTRY(fmodf)
-	movss	%xmm0,-4(%rsp)
-	movss	%xmm1,-8(%rsp)
-	flds	-8(%rsp)
-	flds	-4(%rsp)
+	flds	8(%esp)
+	flds	4(%esp)
 1:	fprem
 	fstsw	%ax
-	testw	$0x400,%ax
-	jne	1b
-	fstps	-4(%rsp)
-	movss	-4(%rsp),%xmm0
-	fstp	%st
+	sahf
+	jp	1b
+	fstp	%st(1)
 	ret
 END(fmodf)
 
 	.section .note.GNU-stack,"",%progbits
Index: head/lib/msun/i387/e_fmodl.S
===================================================================
--- head/lib/msun/i387/e_fmodl.S	(revision 305384)
+++ head/lib/msun/i387/e_fmodl.S	(revision 305385)
@@ -1,50 +1,50 @@
 /*
  * Copyright (c) 1993,94 Winning Strategies, Inc.
  * 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 Winning Strategies, Inc.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
  */
 
 /*
- * Based on the i387 version written by:
+ * Written by:
  *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
  */
 
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$")
 
 ENTRY(fmodl)
-	fldt	24(%rsp)
-	fldt	8(%rsp)
+	fldt	16(%esp)
+	fldt	4(%esp)
 1:	fprem
 	fstsw	%ax
-	testw	$0x400,%ax
-	jne	1b
+	sahf
+	jp	1b
 	fstp	%st(1)
 	ret
 END(fmodl)
 
 	.section .note.GNU-stack,"",%progbits