summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/libm-i387/s_ilogb.S1
-rw-r--r--sysdeps/libm-i387/s_ilogbf.S1
-rw-r--r--sysdeps/libm-i387/s_ilogbl.S1
-rw-r--r--sysdeps/libm-i387/s_llrint.S1
-rw-r--r--sysdeps/libm-i387/s_lrint.S1
-rw-r--r--sysdeps/libm-ieee754/k_standard.c10
-rw-r--r--sysdeps/unix/sysv/linux/Makefile6
7 files changed, 10 insertions, 11 deletions
diff --git a/sysdeps/libm-i387/s_ilogb.S b/sysdeps/libm-i387/s_ilogb.S
index 6c125586c7..015fb6f43c 100644
--- a/sysdeps/libm-i387/s_ilogb.S
+++ b/sysdeps/libm-i387/s_ilogb.S
@@ -14,6 +14,7 @@ ENTRY(__ilogb)
 	fstpl	%st
 
 	fistpl	(%esp)
+	fwait
 	popl	%eax
 
 	ret
diff --git a/sysdeps/libm-i387/s_ilogbf.S b/sysdeps/libm-i387/s_ilogbf.S
index b08a32f4ef..fd055ab7ab 100644
--- a/sysdeps/libm-i387/s_ilogbf.S
+++ b/sysdeps/libm-i387/s_ilogbf.S
@@ -14,6 +14,7 @@ ENTRY(__ilogbf)
 	fstpl	%st
 
 	fistpl	(%esp)
+	fwait
 	popl	%eax
 
 	ret
diff --git a/sysdeps/libm-i387/s_ilogbl.S b/sysdeps/libm-i387/s_ilogbl.S
index adc88aabab..1dad93abeb 100644
--- a/sysdeps/libm-i387/s_ilogbl.S
+++ b/sysdeps/libm-i387/s_ilogbl.S
@@ -15,6 +15,7 @@ ENTRY(__ilogbl)
 	fstp	%st
 
 	fistpl	(%esp)
+	fwait
 	popl	%eax
 
 	ret
diff --git a/sysdeps/libm-i387/s_llrint.S b/sysdeps/libm-i387/s_llrint.S
index cfb8e86f7d..49bfebc993 100644
--- a/sysdeps/libm-i387/s_llrint.S
+++ b/sysdeps/libm-i387/s_llrint.S
@@ -26,6 +26,7 @@ ENTRY(__llrint)
 	fldt	4(%esp)
 	subl	$8, %esp
 	fistpll	(%esp)
+	fwait
 	popl	%eax
 	popl	%edx
 	ret
diff --git a/sysdeps/libm-i387/s_lrint.S b/sysdeps/libm-i387/s_lrint.S
index 19241456a8..3be4ca7903 100644
--- a/sysdeps/libm-i387/s_lrint.S
+++ b/sysdeps/libm-i387/s_lrint.S
@@ -26,6 +26,7 @@ ENTRY(__lrint)
 	fldt	4(%esp)
 	subl	$4, %esp
 	fistpl	(%esp)
+	fwait
 	popl	%eax
 	ret
 END(__lrint)
diff --git a/sysdeps/libm-ieee754/k_standard.c b/sysdeps/libm-ieee754/k_standard.c
index d1f82747f6..391ab057ca 100644
--- a/sysdeps/libm-ieee754/k_standard.c
+++ b/sysdeps/libm-ieee754/k_standard.c
@@ -826,10 +826,7 @@ static double zero = 0.0;	/* used as const */
 		exc.type = OVERFLOW;
 		exc.name = type < 100 ? "gamma" : (type < 200
 						   ? "gammaf" : "gammal");
-                if (_LIB_VERSION == _SVID_)
-                  exc.retval = HUGE;
-                else
-                  exc.retval = HUGE_VAL;
+		exc.retval = HUGE_VAL;
                 if (_LIB_VERSION == _POSIX_)
 		  __set_errno (ERANGE);
                 else if (!matherr(&exc)) {
@@ -843,10 +840,7 @@ static double zero = 0.0;	/* used as const */
 		exc.type = SING;
 		exc.name = type < 100 ? "gamma" : (type < 200
 						   ? "gammaf" : "gammal");
-                if (_LIB_VERSION == _SVID_)
-                  exc.retval = HUGE;
-                else
-                  exc.retval = NAN;
+		exc.retval = HUGE_VAL;
 		if (_LIB_VERSION == _POSIX_)
 		  __set_errno (EDOM);
 		else if (!matherr(&exc)) {
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 42f64638ca..4ab97b2e92 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -68,7 +68,7 @@ inhibit-glue = yes
 # Tell sysdeps/posix/Makefile that we create stdio_lim.h differently.
 inhibit-stdio_lim = yes
 
-$(common-objpfx)stdio_%.h $(common-objpfx)stdio_%.d: \
+$(common-objpfx)bits/stdio_%.h $(common-objpfx)bits/stdio_%.d: \
  $(..)sysdeps/unix/sysv/linux/stdio_%.h.in
 	rm -f $(@:.h=.d) $(@:.d=.h)-t
 	echo '#include <linux/limits.h>' | \
@@ -88,6 +88,6 @@ $(common-objpfx)stdio_%.h $(common-objpfx)stdio_%.d: \
 	rm -f $(@:.d=.h)-t
 ifndef no_deps
 # Get the list of dependencies (probably /usr/include/linux/limits.h).
--include $(common-objpfx)stdio_lim.d
+-include $(common-objpfx)bits/stdio_lim.d
 endif
-common-generated += stdio_lim.h stdio_lim.d
+common-generated += bits/stdio_lim.h bits/stdio_lim.d