5 files changed, 47 insertions, 0 deletions
diff --git a/sysdeps/i386/fpu/e_scalb.S b/sysdeps/i386/fpu/e_scalb.S
index 6a01aa64d6..370924c29f 100644
--- a/sysdeps/i386/fpu/e_scalb.S
+++ b/sysdeps/i386/fpu/e_scalb.S
@@ -6,6 +6,7 @@
  */
 
 #include <machine/asm.h>
+#include <i386-math-asm.h>
 
 	.section .rodata
 
@@ -52,6 +53,7 @@ ENTRY(__ieee754_scalb)
 	jne	4f
 	fscale
 	fstp	%st(1)
+	DBL_NARROW_EVAL
 	ret
 
 	/* y is -inf */
diff --git a/sysdeps/i386/fpu/e_scalbf.S b/sysdeps/i386/fpu/e_scalbf.S
index 12b25159ac..4f2dfa3acf 100644
--- a/sysdeps/i386/fpu/e_scalbf.S
+++ b/sysdeps/i386/fpu/e_scalbf.S
@@ -7,6 +7,7 @@
  */
 
 #include <machine/asm.h>
+#include <i386-math-asm.h>
 
 	.section .rodata
 
@@ -54,6 +55,7 @@ ENTRY(__ieee754_scalbf)
 	jne	4f
 	fscale
 	fstp	%st(1)
+	FLT_NARROW_EVAL
 	ret
 
 	/* y is -inf */
diff --git a/sysdeps/i386/fpu/i386-math-asm.h b/sysdeps/i386/fpu/i386-math-asm.h
new file mode 100644
index 0000000000..fd4313016c
--- /dev/null
+++ b/sysdeps/i386/fpu/i386-math-asm.h
@@ -0,0 +1,39 @@
+/* Helper macros for x86 libm functions.
+   Copyright (C) 2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _I386_MATH_ASM_H
+#define _I386_MATH_ASM_H 1
+
+/* Remove excess range and precision by storing a value on the stack
+   and loading it back.  */
+#define FLT_NARROW_EVAL				\
+	subl	$4, %esp;			\
+	cfi_adjust_cfa_offset (4);		\
+	fstps	(%esp);				\
+	flds	(%esp);				\
+	addl	$4, %esp;			\
+	cfi_adjust_cfa_offset (-4);
+#define DBL_NARROW_EVAL				\
+	subl	$8, %esp;			\
+	cfi_adjust_cfa_offset (8);		\
+	fstpl	(%esp);				\
+	fldl	(%esp);				\
+	addl	$8, %esp;			\
+	cfi_adjust_cfa_offset (-8);
+
+#endif /* i386-math-asm.h.  */
diff --git a/sysdeps/i386/fpu/s_scalbn.S b/sysdeps/i386/fpu/s_scalbn.S
index dab75801c5..4e90903115 100644
--- a/sysdeps/i386/fpu/s_scalbn.S
+++ b/sysdeps/i386/fpu/s_scalbn.S
@@ -4,6 +4,7 @@
  */
 
 #include <machine/asm.h>
+#include <i386-math-asm.h>
 
 RCSID("$NetBSD: s_scalbn.S,v 1.4 1995/05/09 00:19:06 jtc Exp $")
 
@@ -12,6 +13,7 @@ ENTRY(__scalbn)
 	fldl	4(%esp)
 	fscale
 	fstp	%st(1)
+	DBL_NARROW_EVAL
 	ret
 END (__scalbn)
 strong_alias (__scalbn, __scalbln)
diff --git a/sysdeps/i386/fpu/s_scalbnf.S b/sysdeps/i386/fpu/s_scalbnf.S
index ad97be86f4..f8353c4c75 100644
--- a/sysdeps/i386/fpu/s_scalbnf.S
+++ b/sysdeps/i386/fpu/s_scalbnf.S
@@ -4,6 +4,7 @@
  */
 
 #include <machine/asm.h>
+#include <i386-math-asm.h>
 
 RCSID("$NetBSD: s_scalbnf.S,v 1.3 1995/05/09 00:19:59 jtc Exp $")
 
@@ -12,6 +13,7 @@ ENTRY(__scalbnf)
 	flds	4(%esp)
 	fscale
 	fstp	%st(1)
+	FLT_NARROW_EVAL
 	ret
 END (__scalbnf)
 strong_alias (__scalbnf, __scalblnf)