From f4c6bde95cc76f4966ecff5842a06be3fd71e13c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 2 Feb 2006 05:12:40 +0000 Subject: [PATCH] Updated to fedora-glibc-20060202T0507 --- ChangeLog | 32 +++++++++++++++++++++++++++++--- fedora/branch.mk | 4 ++-- libio/bits/libio-ldbl.h | 2 -- libio/genops.c | 1 + mach/Machrules | 9 +++++---- math/bits/mathcalls.h | 9 ++++++--- sysdeps/ieee754/ldbl-128ibm/s_finitel.c | 9 ++++++--- sysdeps/unix/sysv/linux/i386/sysconf.c | 16 +++++++++++++++- 8 files changed, 64 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5331e71eb..34eaad0426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,39 @@ -2006-01-30 Jakub Jelinek +2006-02-01 Roland McGrath - * include/bits/stdlib-ldbl.h: New file. - * include/bits/wchar-ldbl.h: New file. + * mach/Machrules ($(objpfx)%.uh, $(objpfx)%.__h): Use static pattern + rules for these, not implicit rules. + ($(objpfx)%.h): Likewise. + Reported by Thomas Schwinge . 2006-02-01 Jakub Jelinek + * sysdeps/ieee754/ldbl-128ibm/s_finitel.c: Use long_double_symbol + even for libm. + + * libio/bits/libio-ldbl.h (_IO_vfwscanf, _IO_vfwprintf): Remove + __LDBL_REDIR_DECL. + + * math/bits/mathcalls.h: Guard __END_NAMESPACE_C99 with the + same #if condition as corresponding __BEGIN_NAMESPACE_C99. + (scalb): Don't define only if __USE_ISOC99. + * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo. * sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps. +2006-01-30 Jakub Jelinek + + * include/bits/stdlib-ldbl.h: New file. + * include/bits/wchar-ldbl.h: New file. + +2006-01-19 Thomas Schwinge + + * libio/genops.c: Include . + +2006-02-01 Ulrich Drepper + + * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_02_known): Add + some more entries. + 2006-01-31 Jakub Jelinek * sysdeps/unix/sysv/linux/alpha/fpu/Implies: New file. diff --git a/fedora/branch.mk b/fedora/branch.mk index 4acea389a0..27466b04c6 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-fc4 -fedora-sync-date := 2006-02-01 08:46 UTC -fedora-sync-tag := fedora-glibc-20060201T0846 +fedora-sync-date := 2006-02-02 05:07 UTC +fedora-sync-tag := fedora-glibc-20060202T0507 diff --git a/libio/bits/libio-ldbl.h b/libio/bits/libio-ldbl.h index 6e02115f4a..8674bcb0b8 100644 --- a/libio/bits/libio-ldbl.h +++ b/libio/bits/libio-ldbl.h @@ -23,5 +23,3 @@ __LDBL_REDIR_DECL (_IO_vfscanf) __LDBL_REDIR_DECL (_IO_vfprintf) -__LDBL_REDIR_DECL (_IO_vfwscanf) -__LDBL_REDIR_DECL (_IO_vfwprintf) diff --git a/libio/genops.c b/libio/genops.c index da29ade4e6..030343e7aa 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -33,6 +33,7 @@ #include #endif #include +#include #ifdef _IO_MTSAFE_IO static _IO_lock_t list_all_lock = _IO_lock_initializer; diff --git a/mach/Machrules b/mach/Machrules index 79dec997e9..fd61833046 100644 --- a/mach/Machrules +++ b/mach/Machrules @@ -1,5 +1,5 @@ # Rules for MiG interfaces that want to go into the C library. -# Copyright (C) 1991,92,93,94,95,96,98,99,2001,02 +# Copyright (C) 1991,1992,1993,1994,1995,1996,1998,1999,2001,2002,2006 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -158,14 +158,14 @@ $(objpfx)%_server.c $(objpfx)%_server.h: # To get header files that declare both the straight and __ functions, # we generate two files and paste them together. -$(objpfx)%.uh:; $(mig.uh) +$(patsubst %,$(objpfx)%.uh,$(user-interfaces)): $(objpfx)%.uh:; $(mig.uh) define mig.uh $(make-target-directory) $(include-%.defs) | \ $(MIG) - /dev/null $(MIGFLAGS) $(MIGFLAGS-$*) \ -header $@ -server /dev/null -user /dev/null endef -$(objpfx)%.__h:; $(mig.__h) +$(patsubst %,$(objpfx)%.__h,$(user-interfaces)): $(objpfx)%.__h:; $(mig.__h) define mig.__h $(make-target-directory) $(include-%.defs) | \ @@ -173,7 +173,8 @@ $(MIG) - /dev/null $(MIGFLAGS) $(MIGFLAGS-$*) -prefix __ \ -header $@ -server /dev/null -user /dev/null endef -$(objpfx)%.h: $(objpfx)%.__h $(objpfx)%.uh +$(patsubst %,$(objpfx)%.h,$(user-interfaces)): $(objpfx)%.h: $(objpfx)%.__h \ + $(objpfx)%.uh # The last line of foo.__h is "#endif _foo_user_". # The first two lines of foo.uh are "#ifndef _foo_user_"/"#define _foo_user_". (sed -e '$$d' $<; sed -e '1,2d' $(word 2,$^)) > $@-new diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h index 174fe34589..64da6276f6 100644 --- a/math/bits/mathcalls.h +++ b/math/bits/mathcalls.h @@ -353,10 +353,13 @@ __MATHDECL_1 (int, __signbit,, (_Mdouble_ __value)) /* Multiply-add function computed as a ternary operation. */ __MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z)); +#endif /* Use ISO C99. */ + +#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99 __END_NAMESPACE_C99 +#endif -# if defined __USE_MISC || defined __USE_XOPEN_EXTENDED +#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED /* Return X times (2 to the Nth power). */ __MATHCALL (scalb,, (_Mdouble_ __x, _Mdouble_ __n)); -# endif -#endif /* Use ISO C99. */ +#endif diff --git a/sysdeps/ieee754/ldbl-128ibm/s_finitel.c b/sysdeps/ieee754/ldbl-128ibm/s_finitel.c index 142d3ed90b..49f2c92385 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_finitel.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_finitel.c @@ -35,8 +35,11 @@ ___finitel (long double x) -0x7ff0000000000000LL)>>63); } hidden_ver (___finitel, __finitel) -#ifndef IS_IN_libm weak_alias (___finitel, ____finitel) -long_double_symbol (libc, ___finitel, finitel); -long_double_symbol (libc, ____finitel, __finitel); +#ifdef IS_IN_libm +long_double_symbol (libm, ____finitel, finitel); +long_double_symbol (libm, ___finitel, __finitel); +#else +long_double_symbol (libc, ____finitel, finitel); +long_double_symbol (libc, ___finitel, __finitel); #endif diff --git a/sysdeps/unix/sysv/linux/i386/sysconf.c b/sysdeps/unix/sysv/linux/i386/sysconf.c index eae849b277..58f119bcda 100644 --- a/sysdeps/unix/sysv/linux/i386/sysconf.c +++ b/sysdeps/unix/sysv/linux/i386/sysconf.c @@ -1,5 +1,5 @@ /* Get file-specific information about a file. Linux version. - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2006 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 @@ -84,11 +84,24 @@ static const struct intel_02_cache_info { 0x29, _SC_LEVEL3_CACHE_SIZE, 4194304, 8, 64 }, { 0x2c, _SC_LEVEL1_DCACHE_SIZE, 32768, 8, 64 }, { 0x30, _SC_LEVEL1_ICACHE_SIZE, 32768, 8, 64 }, + { 0x39, _SC_LEVEL2_CACHE_SIZE, 131072, 4, 64 }, + { 0x3a, _SC_LEVEL2_CACHE_SIZE, 196608, 6, 64 }, + { 0x3b, _SC_LEVEL2_CACHE_SIZE, 131072, 2, 64 }, + { 0x3c, _SC_LEVEL2_CACHE_SIZE, 262144, 4, 64 }, + { 0x3d, _SC_LEVEL2_CACHE_SIZE, 393216, 6, 64 }, + { 0x3e, _SC_LEVEL2_CACHE_SIZE, 524288, 4, 64 }, { 0x41, _SC_LEVEL2_CACHE_SIZE, 131072, 4, 32 }, { 0x42, _SC_LEVEL2_CACHE_SIZE, 262144, 4, 32 }, { 0x43, _SC_LEVEL2_CACHE_SIZE, 524288, 4, 32 }, { 0x44, _SC_LEVEL2_CACHE_SIZE, 1048576, 4, 32 }, { 0x45, _SC_LEVEL2_CACHE_SIZE, 2097152, 4, 32 }, + { 0x46, _SC_LEVEL3_CACHE_SIZE, 4194304, 4, 64 }, + { 0x47, _SC_LEVEL3_CACHE_SIZE, 8388608, 8, 64 }, + { 0x49, _SC_LEVEL3_CACHE_SIZE, 4194304, 16, 64 }, + { 0x4a, _SC_LEVEL3_CACHE_SIZE, 6291456, 12, 64 }, + { 0x4b, _SC_LEVEL3_CACHE_SIZE, 8388608, 16, 64 }, + { 0x4c, _SC_LEVEL3_CACHE_SIZE, 12582912, 12, 64 }, + { 0x4d, _SC_LEVEL3_CACHE_SIZE, 16777216, 16, 64 }, { 0x60, _SC_LEVEL1_DCACHE_SIZE, 16384, 8, 64 }, { 0x66, _SC_LEVEL1_DCACHE_SIZE, 8192, 4, 64 }, { 0x67, _SC_LEVEL1_DCACHE_SIZE, 16384, 4, 64 }, @@ -99,6 +112,7 @@ static const struct intel_02_cache_info { 0x7b, _SC_LEVEL2_CACHE_SIZE, 524288, 8, 64 }, { 0x7c, _SC_LEVEL2_CACHE_SIZE, 1048576, 8, 64 }, { 0x7d, _SC_LEVEL2_CACHE_SIZE, 2097152, 8, 64 }, + { 0x7f, _SC_LEVEL2_CACHE_SIZE, 524288, 2, 64 }, { 0x82, _SC_LEVEL2_CACHE_SIZE, 262144, 8, 32 }, { 0x83, _SC_LEVEL2_CACHE_SIZE, 524288, 8, 32 }, { 0x84, _SC_LEVEL2_CACHE_SIZE, 1048576, 8, 32 }, -- 2.11.4.GIT