Update. cvs/libc-ud-970621

1997-06-21 17:35  Ulrich Drepper  <drepper@cygnus.com>

	* argp/argp.h: Remove extra #endif.  Pretty print.
	* md5-crypt/md5.h: Likewise.

	* ctype/ctype.h: Don't use <gnu/types.h> but <bits/types.h>.
	* wctype/wctype.h: Likewise.

	* sysdeps/unix/sysv/linux/Makefile: Build stdio_lim.h in correct
	directory.

	* sysdeps/libm-i387/s_ilogb.S: Add fwait to ensure we get the result.
	* sysdeps/libm-i387/s_ilogbf.S: Likewise.
	* sysdeps/libm-i387/s_ilogbl.S: Likewise.
	* sysdeps/libm-i387/s_lrint.S: Likewise.
	* sysdeps/libm-i387/s_llrint.S: Likewise.

12 files changed, 51 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c133418a9..ec17702d57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+1997-06-21 17:35  Ulrich Drepper  <drepper@cygnus.com>
+
+	* argp/argp.h: Remove extra #endif.  Pretty print.
+	* md5-crypt/md5.h: Likewise.
+
+	* ctype/ctype.h: Don't use <gnu/types.h> but <bits/types.h>.
+	* wctype/wctype.h: Likewise.
+
+	* sysdeps/unix/sysv/linux/Makefile: Build stdio_lim.h in correct
+	directory.
+
+	* sysdeps/libm-i387/s_ilogb.S: Add fwait to ensure we get the result.
+	* sysdeps/libm-i387/s_ilogbf.S: Likewise.
+	* sysdeps/libm-i387/s_ilogbl.S: Likewise.
+	* sysdeps/libm-i387/s_lrint.S: Likewise.
+	* sysdeps/libm-i387/s_llrint.S: Likewise.
+
 1997-06-21 02:48  Ulrich Drepper  <drepper@cygnus.com>
 
 	* config.h.in: Add DO_STATIC_NSS.
@@ -166,21 +183,13 @@
 	* xlocale.h: Likewise.
 	* xopen_lim.h: Likewise.
 
-	* linuxthreads/sysdeps/alpha/semaphorebits.h: -> .../bits/semaphore.h.
-	* linuxthreads/sysdeps/powerpc/semaphorebits.h: Likewise.
-	* linuxthreads/sysdeps/pthread/cmpxchg/semaphorebits.h: Likewise.
-	* linuxthreads/sysdeps/pthread/no-cmpxchg/semaphorebits.h: Likewise.
-	* linuxthreads/sysdeps/pthread/libc-lock.h: -> bits/
 	* sysdeps/mach/libc-lock.h: Likewise.
 	* sysdeps/stub/libc-lock.h: Likewise.
-	* linuxthreads/sysdeps/pthread/stdio-lock.h: Likewise.
-	* linuxthreads/sysdeps/unix/sysv/linux/local_lim.h: Likewise.
 	* sysdeps/mach/hurd/local_lim.h: Likewise.
 	* sysdeps/stub/local_lim.h: Likewise.
 	* sysdeps/unix/sysv/linux/local_lim.h: Likewise.
 	* sysdeps/unix/sysv/local_lim.h: Likewise.
 	* sysdeps/unix/sysv/sco3.2/local_lim.h: Likewise.
-	* linuxthreads/sysdeps/unix/sysv/linux/posix_opt.h: Likewise.
 	* sysdeps/mach/hurd/posix_opt.h: Likewise.
 	* sysdeps/stub/posix_opt.h: Likewise.
 	* sysdeps/unix/bsd/posix_opt.h: Likewise.
@@ -405,8 +414,6 @@
 	* io/sys/stat.h: Likewise.
 	* io/sys/statfs.h: Likewise.
 	* io/utime.h: Likewise.
-	* linuxthreads/semaphore.h: Likewise.
-	* linuxthreads/sysdeps/pthread/pthread.h: Likewise.
 	* locale/locale.h: Likewise.
 	* login/pty.h: Likewise.
 	* login/utmp.h: Likewise.
@@ -490,8 +497,6 @@
 	* libio/libio.h: Likewise.
 	* libio/libioP.h: Likewise.
 	* libio/stdio.h: Likewise.
-	* linuxthreads/lockfile.c: Likewise.
-	* linuxthreads/semaphore.h: Likewise.
 	* locale/duplocale.c: Likewise.
 	* locale/freelocale.c: Likewise.
 	* locale/lc-time.c: Likewise.
@@ -642,8 +647,6 @@
 	* dirent/Makefile: Likewise.
 	* elf/Makefile: Likewise.
 	* io/Makefile: Likewise.
-	* linuxthreads/Makefile: Likewise.
-	* linuxthreads/sysdeps/pthread/Makefile: Likewise.
 	* login/Makefile: Likewise.
 	* math/Makefile: Likewise.
 	* misc/Makefile: Likewise.
@@ -4826,8 +4829,6 @@
 
 1997-03-19 15:13  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
-	* linuxthreads/sysdeps/sparc/pt-machine (RELEASE): Fix.
-
 	* stdlib/tst-strtol.c: Save the value of errno, printf may modify
 	it.
 
diff --git a/argp/argp.h b/argp/argp.h
index 600264e6b7..55024cac12 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -29,16 +29,16 @@
 #include <errno.h>
 
 #ifndef __const
-#define __const const
+# define __const const
 #endif
 
 #ifndef __error_t_defined
 typedef int error_t;
-#define __error_t_defined
+# define __error_t_defined
 #endif
 
 #ifndef __P
-# if (defined (__STDC__) && __STDC__) || defined (__cplusplus)
+# if (defined __STDC__ && __STDC__) || defined __cplusplus
 #  define __P(args)	args
 # else
 #  define __P(args)	()
@@ -510,16 +510,16 @@ extern void *__argp_input __P ((__const struct argp *argp,
 
 #ifdef __OPTIMIZE__
 
-#if !_LIBC
-# define __argp_usage argp_usage
-# define __argp_state_help argp_state_help
-# define __option_is_short _option_is_short
-# define __option_is_end _option_is_end
-#endif
+# if !_LIBC
+#  define __argp_usage argp_usage
+#  define __argp_state_help argp_state_help
+#  define __option_is_short _option_is_short
+#  define __option_is_end _option_is_end
+# endif
 
-#ifndef ARGP_EI
-# define ARGP_EI extern inline
-#endif
+# ifndef ARGP_EI
+#  define ARGP_EI extern inline
+# endif
 
 ARGP_EI void
 __argp_usage (__const struct argp_state *__state)
@@ -545,17 +545,16 @@ __option_is_end (__const struct argp_option *__opt)
   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
 }
 
-#if !_LIBC
-# undef __argp_usage
-# undef __argp_state_help
-# undef __option_is_short
-# undef __option_is_end
-#endif
-#endif /* argp.h */
+# if !_LIBC
+#  undef __argp_usage
+#  undef __argp_state_help
+#  undef __option_is_short
+#  undef __option_is_end
+# endif
 #endif /* __OPTIMIZE__ */
 
 #ifdef  __cplusplus
 }
 #endif
 
-#endif /* __ARGP_H__ */
+#endif /* argp.h */
diff --git a/ctype/ctype.h b/ctype/ctype.h
index 22b17c1ed7..922f5b38c8 100644
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -24,7 +24,7 @@
 #define	_CTYPE_H	1
 
 #include <features.h>
-#include <gnu/types.h>
+#include <bits/types.h>
 
 __BEGIN_DECLS
 
diff --git a/md5-crypt/md5.h b/md5-crypt/md5.h
index b668a64284..dacc1ae73b 100644
--- a/md5-crypt/md5.h
+++ b/md5-crypt/md5.h
@@ -72,9 +72,9 @@ typedef u_int32_t md5_uint32;
 
 #undef __P
 #if defined (__STDC__) && __STDC__
-#define	__P(x) x
+# define __P(x) x
 #else
-#define	__P(x) ()
+# define __P(x) ()
 #endif
 
 /* Structure to save state of computation between the single steps.  */
@@ -143,7 +143,6 @@ extern void *md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf));
    resulting message digest number will be written into the 16 bytes
    beginning at RESBLOCK.  */
 extern int __md5_stream __P ((FILE *stream, void *resblock));
-#endif /* md5.h */
 
 /* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
@@ -154,4 +153,4 @@ extern void *__md5_buffer __P ((const char *buffer, size_t len,
 extern void *md5_buffer __P ((const char *buffer, size_t len,
 			      void *resblock));
 
-#endif
+#endif /* md5.h */
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
diff --git a/wctype/wctype.h b/wctype/wctype.h
index 9c9258f183..1862c6ca8f 100644
--- a/wctype/wctype.h
+++ b/wctype/wctype.h
@@ -25,7 +25,7 @@
 #define _WCTYPE_H	1
 
 #include <features.h>
-#include <gnu/types.h>
+#include <bits/types.h>
 
 __BEGIN_DECLS