From fe7b9c54e741e357efff8ca72ded4648b0bf004b Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Nov 05 2009 12:14:13 +0000 Subject: 2.11-2 --- diff --git a/.cvsignore b/.cvsignore index 6935a89..69f36c8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.11-fedora.tar.bz2 glibc-2.11.tar.bz2 +glibc-2.11-fedora.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 4950f8b..bbb24b0 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,34 @@ --- glibc-2.11/ChangeLog -+++ glibc-2.11-1/ChangeLog -@@ -209,22 +209,6 @@ d2009-10-30 Ulrich Drepper ++++ glibc-2.11-2/ChangeLog +@@ -1,3 +1,27 @@ ++2009-11-04 Jakub Jelinek ++ ++ * misc/sys/uio.h (preadv, pwritev): Fix type of last argument ++ when -D_FILE_OFFSET_BITS=64. ++ ++ * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h (fallocate): Fix types ++ of last two arguments when -D_FILE_OFFSET_BITS=64. ++ * sysdeps/unix/sysv/linux/i386/bits/fcntl.h (fallocate): Likewise. ++ * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (fallocate): Likewise. ++ * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h (fallocate): Likewise. ++ * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (fallocate): Likewise. ++ * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (fallocate): Likewise. ++ * sysdeps/unix/sysv/linux/sh/bits/fcntl.h (fallocate): Likewise. ++ ++2009-11-03 Jakub Jelinek ++ ++ * sysdeps/powerpc/powerpc64/dl-machine.h (resolve_ifunc): Don't ++ relocate opd entry when resolving prelink conflicts. ++ ++2009-11-03 Andreas Schwab ++ ++ * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Add ++ readahead. ++ + 2009-10-30 Ulrich Drepper + + * version.h (VERSION): Bump for 2.11 release. +@@ -209,22 +233,6 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/netinet/ip.h: Define IPTOS_ENC* and IPTOS_DSCP* macros. Patch by Philip Prindeville . @@ -23,7 +51,7 @@ [BZ #10847] * sysdeps/gnu/getutmp.c: Allow compatibility code to play around with getutmpx symbol. -@@ -312,17 +296,6 @@ d2009-10-30 Ulrich Drepper +@@ -312,17 +320,6 @@ d2009-10-30 Ulrich Drepper * locale/C-time.c: Revert week-1stday back to 19971130 and set first_weekday to 1 and first_workday to 2. @@ -41,7 +69,7 @@ 2009-09-28 Andreas Schwab * stdio-common/printf_fp.c: Check for and avoid integer overflows. -@@ -980,6 +953,11 @@ d2009-10-30 Ulrich Drepper +@@ -980,6 +977,11 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const. @@ -53,7 +81,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -1245,6 +1223,11 @@ d2009-10-30 Ulrich Drepper +@@ -1245,6 +1247,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -65,7 +93,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -9938,6 +9921,10 @@ d2009-10-30 Ulrich Drepper +@@ -9938,6 +9945,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -76,7 +104,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -11195,6 +11182,15 @@ d2009-10-30 Ulrich Drepper +@@ -11195,6 +11206,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -93,7 +121,7 @@ [BZ #3632] --- glibc-2.11/ChangeLog.15 -+++ glibc-2.11-1/ChangeLog.15 ++++ glibc-2.11-2/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -160,7 +188,7 @@ * scripts/extract-abilist.awk: If `lastversion' variable defined, omit --- glibc-2.11/ChangeLog.16 -+++ glibc-2.11-1/ChangeLog.16 ++++ glibc-2.11-2/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -215,7 +243,7 @@ [BZ #1137] --- glibc-2.11/Makeconfig -+++ glibc-2.11-1/Makeconfig ++++ glibc-2.11-2/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -233,7 +261,7 @@ ifndef BUILD_CC BUILD_CC = $(CC) --- glibc-2.11/csu/Makefile -+++ glibc-2.11-1/csu/Makefile ++++ glibc-2.11-2/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -245,7 +273,7 @@ vpath initfini.c $(sysdirs) --- glibc-2.11/csu/elf-init.c -+++ glibc-2.11-1/csu/elf-init.c ++++ glibc-2.11-2/csu/elf-init.c @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -271,7 +299,7 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ --- glibc-2.11/debug/tst-chk1.c -+++ glibc-2.11-1/debug/tst-chk1.c ++++ glibc-2.11-2/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -301,7 +329,7 @@ # else # define O 1 --- glibc-2.11/elf/ldconfig.c -+++ glibc-2.11-1/elf/ldconfig.c ++++ glibc-2.11-2/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -384,7 +412,7 @@ if (! opt_ignore_aux_cache) --- glibc-2.11/elf/tst-stackguard1.c -+++ glibc-2.11-1/elf/tst-stackguard1.c ++++ glibc-2.11-2/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -410,15 +438,15 @@ puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); --- glibc-2.11/include/bits/stdlib-ldbl.h -+++ glibc-2.11-1/include/bits/stdlib-ldbl.h ++++ glibc-2.11-2/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include --- glibc-2.11/include/bits/wchar-ldbl.h -+++ glibc-2.11-1/include/bits/wchar-ldbl.h ++++ glibc-2.11-2/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include --- glibc-2.11/include/features.h -+++ glibc-2.11-1/include/features.h ++++ glibc-2.11-2/include/features.h @@ -299,8 +299,13 @@ #endif @@ -436,7 +464,7 @@ # else # define __USE_FORTIFY_LEVEL 1 --- glibc-2.11/intl/locale.alias -+++ glibc-2.11-1/intl/locale.alias ++++ glibc-2.11-2/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -447,7 +475,7 @@ nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 --- glibc-2.11/libio/stdio.h -+++ glibc-2.11-1/libio/stdio.h ++++ glibc-2.11-2/libio/stdio.h @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -462,7 +490,7 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ --- glibc-2.11/locale/iso-4217.def -+++ glibc-2.11-1/locale/iso-4217.def ++++ glibc-2.11-2/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -555,7 +583,7 @@ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ --- glibc-2.11/locale/programs/locarchive.c -+++ glibc-2.11-1/locale/programs/locarchive.c ++++ glibc-2.11-2/locale/programs/locarchive.c @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -588,7 +616,7 @@ const char *oldname, uint32_t *locrec_offset_p) { --- glibc-2.11/localedata/Makefile -+++ glibc-2.11-1/localedata/Makefile ++++ glibc-2.11-2/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -598,7 +626,7 @@ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ --- glibc-2.11/localedata/SUPPORTED -+++ glibc-2.11-1/localedata/SUPPORTED ++++ glibc-2.11-2/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -641,7 +669,7 @@ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ --- glibc-2.11/localedata/locales/cy_GB -+++ glibc-2.11-1/localedata/locales/cy_GB ++++ glibc-2.11-2/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -657,7 +685,7 @@ LC_MESSAGES --- glibc-2.11/localedata/locales/en_GB -+++ glibc-2.11-1/localedata/locales/en_GB ++++ glibc-2.11-2/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -670,7 +698,7 @@ / " --- glibc-2.11/localedata/locales/no_NO -+++ glibc-2.11-1/localedata/locales/no_NO ++++ glibc-2.11-2/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -742,7 +770,7 @@ +copy "nb_NO" +END LC_ADDRESS --- glibc-2.11/localedata/locales/zh_TW -+++ glibc-2.11-1/localedata/locales/zh_TW ++++ glibc-2.11-2/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -771,7 +799,7 @@ date "2000-08-02" % --- glibc-2.11/malloc/mcheck.c -+++ glibc-2.11-1/malloc/mcheck.c ++++ glibc-2.11-2/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -848,7 +876,7 @@ old_free_hook = __free_hook; __free_hook = freehook; --- glibc-2.11/manual/libc.texinfo -+++ glibc-2.11-1/manual/libc.texinfo ++++ glibc-2.11-2/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -859,7 +887,7 @@ * Libc: (libc). C library. @end direntry --- glibc-2.11/misc/sys/cdefs.h -+++ glibc-2.11-1/misc/sys/cdefs.h ++++ glibc-2.11-2/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -903,8 +931,23 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif +--- glibc-2.11/misc/sys/uio.h ++++ glibc-2.11-2/misc/sys/uio.h +@@ -80,10 +80,10 @@ extern ssize_t pwritev (int __fd, __const struct iovec *__iovec, int __count, + # else + # ifdef __REDIRECT + extern ssize_t __REDIRECT (preadv, (int __fd, __const struct iovec *__iovec, +- int __count, __off_t __offset), ++ int __count, __off64_t __offset), + preadv64) __wur; + extern ssize_t __REDIRECT (pwritev, (int __fd, __const struct iovec *__iovec, +- int __count, __off_t __offset), ++ int __count, __off64_t __offset), + pwritev64) __wur; + # else + # define preadv preadv64 --- glibc-2.11/nis/nss -+++ glibc-2.11-1/nis/nss ++++ glibc-2.11-2/nis/nss @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get @@ -912,7 +955,7 @@ -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE --- glibc-2.11/nptl/ChangeLog -+++ glibc-2.11-1/nptl/ChangeLog ++++ glibc-2.11-2/nptl/ChangeLog @@ -3727,6 +3727,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -954,7 +997,7 @@ * tst-cancel17.c (do_test): Check if aio_cancel failed. --- glibc-2.11/nptl/Makefile -+++ glibc-2.11-1/nptl/Makefile ++++ glibc-2.11-2/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -988,7 +1031,7 @@ $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif --- glibc-2.11/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.11-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.11-2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -998,7 +1041,7 @@ + #endif /* bits/posix_opt.h */ --- glibc-2.11/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.11-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1007,7 +1050,7 @@ +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif --- glibc-2.11/nptl/tst-stackguard1.c -+++ glibc-2.11-1/nptl/tst-stackguard1.c ++++ glibc-2.11-2/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1033,7 +1076,7 @@ puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); --- glibc-2.11/nscd/nscd.conf -+++ glibc-2.11-1/nscd/nscd.conf ++++ glibc-2.11-2/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1044,7 +1087,7 @@ debug-level 0 # reload-count 5 --- glibc-2.11/nscd/nscd.init -+++ glibc-2.11-1/nscd/nscd.init ++++ glibc-2.11-2/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1117,7 +1160,7 @@ *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" --- glibc-2.11/posix/Makefile -+++ glibc-2.11-1/posix/Makefile ++++ glibc-2.11-2/posix/Makefile @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1139,7 +1182,7 @@ + > $@.new mv -f $@.new $@ --- glibc-2.11/posix/getconf.speclist.h -+++ glibc-2.11-1/posix/getconf.speclist.h ++++ glibc-2.11-2/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1181,7 +1224,7 @@ +#endif +""; --- glibc-2.11/streams/Makefile -+++ glibc-2.11-1/streams/Makefile ++++ glibc-2.11-2/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1192,7 +1235,7 @@ include ../Rules --- glibc-2.11/sysdeps/generic/dl-cache.h -+++ glibc-2.11-1/sysdeps/generic/dl-cache.h ++++ glibc-2.11-2/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1209,7 +1252,7 @@ /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another --- glibc-2.11/sysdeps/i386/Makefile -+++ glibc-2.11-1/sysdeps/i386/Makefile ++++ glibc-2.11-2/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1235,7 +1278,7 @@ ifeq ($(subdir),elf) --- glibc-2.11/sysdeps/ia64/Makefile -+++ glibc-2.11-1/sysdeps/ia64/Makefile ++++ glibc-2.11-2/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1248,7 +1291,7 @@ endif --- glibc-2.11/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.11-1/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.11-2/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1601,7 +1644,7 @@ - -#endif --- glibc-2.11/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.11-1/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.11-2/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1688,7 +1731,7 @@ + +#endif --- glibc-2.11/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.11-1/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.11-2/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1697,8 +1740,35 @@ endif ifeq ($(subdir),elf) +--- glibc-2.11/sysdeps/powerpc/powerpc64/dl-machine.h ++++ glibc-2.11-2/sysdeps/powerpc/powerpc64/dl-machine.h +@@ -531,13 +531,14 @@ auto inline Elf64_Addr __attribute__ ((always_inline)) + resolve_ifunc (Elf64_Addr value, + const struct link_map *map, const struct link_map *sym_map) + { ++#ifndef RESOLVE_CONFLICT_FIND_MAP + /* The function we are calling may not yet have its opd entry relocated. */ + Elf64_FuncDesc opd; + if (map != sym_map +-#if !defined RTLD_BOOTSTRAP && defined SHARED ++# if !defined RTLD_BOOTSTRAP && defined SHARED + /* Bootstrap map doesn't have l_relocated set for it. */ + && sym_map != &GL(dl_rtld_map) +-#endif ++# endif + && !sym_map->l_relocated) + { + Elf64_FuncDesc *func = (Elf64_FuncDesc *) value; +@@ -546,6 +547,7 @@ resolve_ifunc (Elf64_Addr value, + opd.fd_aux = func->fd_aux; + value = (Elf64_Addr) &opd; + } ++#endif + return ((Elf64_Addr (*) (void)) value) (); + } + --- glibc-2.11/sysdeps/unix/nice.c -+++ glibc-2.11-1/sysdeps/unix/nice.c ++++ glibc-2.11-2/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1714,7 +1784,7 @@ { if (errno == EACCES) --- glibc-2.11/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1731,7 +1801,7 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 --- glibc-2.11/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1780,7 +1850,7 @@ else #endif --- glibc-2.11/sysdeps/unix/sysv/linux/fcntl.c -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/fcntl.c ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/fcntl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002, 2003, 2004, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -1852,7 +1922,7 @@ LIBC_CANCEL_RESET (oldtype); --- glibc-2.11/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1896,7 +1966,7 @@ size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) --- glibc-2.11/sysdeps/unix/sysv/linux/i386/bits/fcntl.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/i386/bits/fcntl.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/i386/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007, 2009 @@ -1946,8 +2016,19 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD +@@ -259,8 +240,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, + extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); + # else + # ifdef __REDIRECT +-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, +- __off_t __len), ++extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, ++ __off64_t __len), + fallocate64); + # else + # define fallocate fallocate64 --- glibc-2.11/sysdeps/unix/sysv/linux/i386/clone.S -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/i386/clone.S ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/i386/clone.S @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1967,7 +2048,7 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) --- glibc-2.11/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2029,7 +2110,7 @@ + +#include_next --- glibc-2.11/sysdeps/unix/sysv/linux/i386/fcntl.c -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/i386/fcntl.c ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/i386/fcntl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000,2002,2003,2004,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2000,2002,2003,2004,2006 Free Software Foundation, Inc. @@ -2078,7 +2159,7 @@ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); } --- glibc-2.11/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux/IA64. - Copyright (C) 1999,2000,2004,2006,2007,2009 Free Software Foundation, Inc. @@ -2128,8 +2209,19 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ +@@ -253,8 +234,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, + extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); + # else + # ifdef __REDIRECT +-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, +- __off_t __len), ++extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, ++ __off64_t __len), + fallocate64); + # else + # define fallocate fallocate64 --- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2163,7 +2255,7 @@ + #include_next --- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include @@ -2171,7 +2263,7 @@ +#include +#endif --- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include @@ -2179,12 +2271,12 @@ +#include +#endif --- glibc-2.11/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ --- glibc-2.11/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/kernel-features.h @@ -542,8 +542,3 @@ # define __ASSUME_PREADV 1 # define __ASSUME_PWRITEV 1 @@ -2195,7 +2287,7 @@ -# define __ASSUME_F_GETOWN_EX 1 -#endif --- glibc-2.11/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2222,7 +2314,7 @@ struct netlink_res { --- glibc-2.11/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2233,7 +2325,7 @@ /* Provide trailing slash, since mostly used for building pathnames. */ --- glibc-2.11/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux/PowerPC. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007, 2009 @@ -2283,8 +2375,28 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD +@@ -259,8 +240,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, + extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); + # else + # ifdef __REDIRECT +-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, +- __off_t __len), ++extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, ++ __off64_t __len), + fallocate64); + # else + # define fallocate fallocate64 +--- glibc-2.11/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list +@@ -3,3 +3,6 @@ + # System calls with wrappers. + oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0 + oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0 ++ ++# Due to 64bit alignment there is a dummy second parameter ++readahead - readahead i:iiiii __readahead readahead --- glibc-2.11/sysdeps/unix/sysv/linux/s390/bits/fcntl.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/s390/bits/fcntl.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/s390/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux. - Copyright (C) 2000,2001,2002,2004,2006,2007,2009 Free Software Foundation, Inc. @@ -2334,8 +2446,19 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD +@@ -279,8 +260,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, + extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); + # else + # ifdef __REDIRECT +-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, +- __off_t __len), ++extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, ++ __off64_t __len), + fallocate64); + # else + # define fallocate fallocate64 --- glibc-2.11/sysdeps/unix/sysv/linux/sh/bits/fcntl.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/sh/bits/fcntl.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/sh/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007, 2009 @@ -2385,8 +2508,19 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD +@@ -259,8 +240,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, + extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); + # else + # ifdef __REDIRECT +-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, +- __off_t __len), ++extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, ++ __off64_t __len), + fallocate64); + # else + # define fallocate fallocate64 --- glibc-2.11/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux/SPARC. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007, 2009 @@ -2438,8 +2572,19 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD +@@ -278,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, + extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); + # else + # ifdef __REDIRECT +-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, +- __off_t __len), ++extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, ++ __off64_t __len), + fallocate64); + # else + # define fallocate fallocate64 --- glibc-2.11/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2486,7 +2631,7 @@ } libc_hidden_def (tcsetattr) --- glibc-2.11/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux/x86-64. - Copyright (C) 2001,2002,2004,2006,2007,2009 Free Software Foundation, Inc. @@ -2536,8 +2681,19 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ #ifdef __USE_BSD +@@ -273,8 +254,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, + extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); + # else + # ifdef __REDIRECT +-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, +- __off_t __len), ++extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, ++ __off64_t __len), + fallocate64); + # else + # define fallocate fallocate64 --- glibc-2.11/sysdeps/unix/sysv/linux/x86_64/clone.S -+++ glibc-2.11-1/sysdeps/unix/sysv/linux/x86_64/clone.S ++++ glibc-2.11-2/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2557,7 +2713,7 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) --- glibc-2.11/timezone/zic.c -+++ glibc-2.11-1/timezone/zic.c ++++ glibc-2.11-2/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; diff --git a/glibc.spec b/glibc.spec index 11d801e..8ee8834 100644 --- a/glibc.spec +++ b/glibc.spec @@ -25,7 +25,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 1 +Release: 2 # 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 @@ -1029,6 +1029,11 @@ rm -f *.filelist* %endif %changelog +* Thu Nov 5 2009 Andreas Schwab - 2.11-2 +- Fix readahead on powerpc32. +- Fix R_PPC64_{JMP_IREL,IRELATIVE} handling. +- Fix preadv, pwritev and fallocate for -D_FILE_OFFSET_BITS=64 (#533063). + * Mon Nov 2 2009 Andreas Schwab - 2.11-1 - Update to 2.11 release. - Disable multi-arch support on PowerPC again since binutils is too old. diff --git a/import.log b/import.log index 3645248..d6a5997 100644 --- a/import.log +++ b/import.log @@ -36,3 +36,4 @@ glibc-2_10_90-25:F-12:glibc-2.10.90-25.src.rpm:1255355210 glibc-2_10_90-26:F-12:glibc-2.10.90-26.src.rpm:1255953059 glibc-2_10_90-27:F-12:glibc-2.10.90-27.src.rpm:1256915929 glibc-2_11-1:F-12:glibc-2.11-1.src.rpm:1257175795 +glibc-2_11-2:F-12:glibc-2.11-2.src.rpm:1257422307 diff --git a/sources b/sources index 40d3d61..3dc907b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -dfc5c4eb74f1f20003d4523269656699 glibc-2.11-fedora.tar.bz2 2c990f97e9ff9fb1c3c85fe826e991b9 glibc-2.11.tar.bz2 +bf01fdc5ae4d1ffa2fefc135dbc6d75c glibc-2.11-fedora.tar.bz2