From d0b6ac6c5023a223e150c49c422c7ad2bd99456c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 14 Mar 2008 22:36:46 +0000 Subject: Updated to fedora-glibc-20080314T2159 --- fedora/branch.mk | 4 ++-- fedora/glibc.spec.in | 5 +++-- nptl/ChangeLog | 7 +++++++ nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h | 3 +++ nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h | 11 ++++++++++- nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h | 11 ++++++++++- nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h | 11 ++++++++++- streams/Makefile | 2 +- 8 files changed, 46 insertions(+), 8 deletions(-) diff --git a/fedora/branch.mk b/fedora/branch.mk index fe8acd07d3..2b4ab28f91 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-f8 -fedora-sync-date := 2008-03-14 17:32 UTC -fedora-sync-tag := fedora-glibc-20080314T1732 +fedora-sync-date := 2008-03-14 21:59 UTC +fedora-sync-tag := fedora-glibc-20080314T2159 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index fc788ddd8a..5faaf525ea 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -19,7 +19,7 @@ Summary: The GNU libc libraries Name: glibc Version: @glibcversion@ -Release: 10 +Release: 11 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -976,8 +976,9 @@ rm -f *.filelist* %endif %changelog -* Fri Mar 14 2008 Jakub Jelinek 2.7.90-10 +* Fri Mar 14 2008 Jakub Jelinek 2.7.90-11 - update to trunk +- remove , define _XOPEN_STREAMS -1 (#436349) * Wed Mar 5 2008 Jakub Jelinek 2.7.90-8 - update to trunk diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 6d94c1ff4a..fbb58e39c7 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2008-03-14 Ulrich Drepper + + * sysdeps/unix/sysv/linux/i386/dl-sysdep.h: Define + HAVE_DL_DISCOVER_OSVERSION. + * sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/ia64/dl-sysdep.h: Likewise. + 2008-03-07 Ulrich Drepper [BZ #5778] diff --git a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h index 06d35ceb16..39f56a0a6b 100644 --- a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +++ b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -181,4 +181,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 +/* Streams are not available. */ +#define _XOPEN_STREAMS -1 + #endif /* posix_opt.h */ diff --git a/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h b/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h index 109ffd1cf6..50902a52a6 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h @@ -1,5 +1,5 @@ /* System-specific settings for dynamic linker code. IA-32 version. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2008 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 @@ -61,4 +61,13 @@ extern void _dl_sysinfo_int80 (void) attribute_hidden; ".previous;"); #endif + +/* The _dl_discover_osversion function is so far only needed in sysconf + to check for kernels later than 2.6.23. */ +#if !defined ASSEMBLER && __LINUX_KERNEL_VERSION < 0x020617 +/* Get version of the OS. */ +extern int _dl_discover_osversion (void) attribute_hidden; +# define HAVE_DL_DISCOVER_OSVERSION 1 +#endif + #endif /* dl-sysdep.h */ diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h b/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h index b7771318a6..1298e59a60 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h @@ -1,5 +1,5 @@ /* System-specific settings for dynamic linker code. IA-32 version. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2008 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 @@ -58,4 +58,13 @@ extern void _dl_sysinfo_int80 (void) attribute_hidden; ".previous"); #endif + +/* The _dl_discover_osversion function is so far only needed in sysconf + to check for kernels later than 2.6.23. */ +#if !defined ASSEMBLER && __LINUX_KERNEL_VERSION < 0x020617 +/* Get version of the OS. */ +extern int _dl_discover_osversion (void) attribute_hidden; +# define HAVE_DL_DISCOVER_OSVERSION 1 +#endif + #endif /* dl-sysdep.h */ diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h b/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h index 525b622a68..42c37ae259 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h +++ b/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h @@ -1,5 +1,5 @@ /* System-specific settings for dynamic linker code. IA-64 version. - Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2006, 2008 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 @@ -65,4 +65,13 @@ extern int _dl_sysinfo_break attribute_hidden; might write into it after _dl_start returns. */ #define DL_ARGV_NOT_RELRO 1 + +/* The _dl_discover_osversion function is so far only needed in sysconf + to check for kernels later than 2.6.23. */ +#if !defined ASSEMBLER && __LINUX_KERNEL_VERSION < 0x020617 +/* Get version of the OS. */ +extern int _dl_discover_osversion (void) attribute_hidden; +# define HAVE_DL_DISCOVER_OSVERSION 1 +#endif + #endif /* dl-sysdep.h */ diff --git a/streams/Makefile b/streams/Makefile index 0f73d5fde5..a71e26819a 100644 --- a/streams/Makefile +++ b/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams -headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h +#headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules -- cgit v1.2.3