diff --git a/.cvsignore b/.cvsignore index 319610e..8d67de6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.11-12-g24c0bf7-fedora.tar.bz2 -glibc-2.11-12-g24c0bf7.tar.bz2 +glibc-2.11-44-g49c7f27-fedora.tar.bz2 +glibc-2.11-44-g49c7f27.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index a996cc6..b243e0e 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,47 +1,6 @@ ---- glibc-2.11-12-g24c0bf7/ChangeLog +--- glibc-2.11-44-g49c7f27/ChangeLog +++ glibc-2.11.90-1/ChangeLog -@@ -275,22 +275,6 @@ d2009-10-30 Ulrich Drepper - * sysdeps/generic/netinet/ip.h: Define IPTOS_ENC* and IPTOS_DSCP* - macros. Patch by Philip Prindeville . - -- [BZ #10840] -- * sysdeps/unix/sysv/linux/kernel-features.h: Define -- __ASSUME_F_GETOWN_EX. -- * sysdeps/unix/sysv/linux/fcntl.c: Implement F_GETOWN using F_GETOWN_EX -- if possible. -- * sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise. -- -- * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Define F_OWNER_* -- and f_owner_ex. -- * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise. -- - [BZ #10847] - * sysdeps/gnu/getutmp.c: Allow compatibility code to play around with - getutmpx symbol. -@@ -378,17 +362,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. - --2009-10-01 Ulrich Drepper -- -- * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Define F_SETOWN_EX and -- F_GETOWN_EX. -- * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise. -- - 2009-09-28 Andreas Schwab - - * stdio-common/printf_fp.c: Check for and avoid integer overflows. -@@ -1046,6 +1019,11 @@ d2009-10-30 Ulrich Drepper +@@ -1186,6 +1186,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 +12,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -1311,6 +1289,11 @@ d2009-10-30 Ulrich Drepper +@@ -1451,6 +1456,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 +24,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -10004,6 +9987,10 @@ d2009-10-30 Ulrich Drepper +@@ -10144,6 +10154,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -76,7 +35,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -11261,6 +11248,15 @@ d2009-10-30 Ulrich Drepper +@@ -11401,6 +11415,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -92,7 +51,7 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.11-12-g24c0bf7/ChangeLog.15 +--- glibc-2.11-44-g49c7f27/ChangeLog.15 +++ glibc-2.11.90-1/ChangeLog.15 @@ -477,6 +477,14 @@ @@ -159,7 +118,7 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.11-12-g24c0bf7/ChangeLog.16 +--- glibc-2.11-44-g49c7f27/ChangeLog.16 +++ glibc-2.11.90-1/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT @@ -214,7 +173,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.11-12-g24c0bf7/Makeconfig +--- glibc-2.11-44-g49c7f27/Makeconfig +++ glibc-2.11.90-1/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. @@ -232,7 +191,7 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.11-12-g24c0bf7/csu/Makefile +--- glibc-2.11-44-g49c7f27/csu/Makefile +++ glibc-2.11.90-1/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h @@ -244,7 +203,7 @@ vpath initfini.c $(sysdirs) ---- glibc-2.11-12-g24c0bf7/csu/elf-init.c +--- glibc-2.11-44-g49c7f27/csu/elf-init.c +++ glibc-2.11.90-1/csu/elf-init.c @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; @@ -270,7 +229,7 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.11-12-g24c0bf7/debug/tst-chk1.c +--- glibc-2.11-44-g49c7f27/debug/tst-chk1.c +++ glibc-2.11.90-1/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA @@ -300,7 +259,7 @@ # define O 0 # else # define O 1 ---- glibc-2.11-12-g24c0bf7/elf/ldconfig.c +--- glibc-2.11-44-g49c7f27/elf/ldconfig.c +++ glibc-2.11.90-1/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -383,7 +342,7 @@ } if (! opt_ignore_aux_cache) ---- glibc-2.11-12-g24c0bf7/elf/tst-stackguard1.c +--- glibc-2.11-44-g49c7f27/elf/tst-stackguard1.c +++ glibc-2.11.90-1/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ @@ -409,15 +368,15 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-12-g24c0bf7/include/bits/stdlib-ldbl.h +--- glibc-2.11-44-g49c7f27/include/bits/stdlib-ldbl.h +++ glibc-2.11.90-1/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-12-g24c0bf7/include/bits/wchar-ldbl.h +--- glibc-2.11-44-g49c7f27/include/bits/wchar-ldbl.h +++ glibc-2.11.90-1/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-12-g24c0bf7/include/features.h +--- glibc-2.11-44-g49c7f27/include/features.h +++ glibc-2.11.90-1/include/features.h @@ -299,8 +299,13 @@ #endif @@ -435,7 +394,7 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.11-12-g24c0bf7/intl/locale.alias +--- glibc-2.11-44-g49c7f27/intl/locale.alias +++ glibc-2.11.90-1/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR @@ -446,7 +405,7 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.11-12-g24c0bf7/libio/stdio.h +--- glibc-2.11-44-g49c7f27/libio/stdio.h +++ glibc-2.11.90-1/libio/stdio.h @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ @@ -461,7 +420,7 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.11-12-g24c0bf7/locale/iso-4217.def +--- glibc-2.11-44-g49c7f27/locale/iso-4217.def +++ glibc-2.11.90-1/locale/iso-4217.def @@ -8,6 +8,7 @@ * @@ -554,7 +513,7 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.11-12-g24c0bf7/locale/programs/locarchive.c +--- glibc-2.11-44-g49c7f27/locale/programs/locarchive.c +++ glibc-2.11.90-1/locale/programs/locarchive.c @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ @@ -587,7 +546,7 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.11-12-g24c0bf7/localedata/Makefile +--- glibc-2.11-44-g49c7f27/localedata/Makefile +++ glibc-2.11.90-1/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ @@ -597,7 +556,7 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.11-12-g24c0bf7/localedata/SUPPORTED +--- glibc-2.11-44-g49c7f27/localedata/SUPPORTED +++ glibc-2.11.90-1/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ @@ -640,7 +599,7 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.11-12-g24c0bf7/localedata/locales/cy_GB +--- glibc-2.11-44-g49c7f27/localedata/locales/cy_GB +++ glibc-2.11.90-1/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" @@ -656,7 +615,7 @@ END LC_TIME LC_MESSAGES ---- glibc-2.11-12-g24c0bf7/localedata/locales/en_GB +--- glibc-2.11-44-g49c7f27/localedata/locales/en_GB +++ glibc-2.11.90-1/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" @@ -669,7 +628,7 @@ date_fmt "/ / " ---- glibc-2.11-12-g24c0bf7/localedata/locales/no_NO +--- glibc-2.11-44-g49c7f27/localedata/locales/no_NO +++ glibc-2.11.90-1/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / @@ -741,7 +700,7 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.11-12-g24c0bf7/localedata/locales/zh_TW +--- glibc-2.11-44-g49c7f27/localedata/locales/zh_TW +++ glibc-2.11.90-1/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % @@ -770,7 +729,7 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.11-12-g24c0bf7/malloc/mcheck.c +--- glibc-2.11-44-g49c7f27/malloc/mcheck.c +++ glibc-2.11.90-1/malloc/mcheck.c @@ -24,9 +24,25 @@ # include @@ -847,7 +806,7 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.11-12-g24c0bf7/manual/libc.texinfo +--- glibc-2.11-44-g49c7f27/manual/libc.texinfo +++ glibc-2.11.90-1/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -858,7 +817,7 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.11-12-g24c0bf7/misc/sys/cdefs.h +--- glibc-2.11-44-g49c7f27/misc/sys/cdefs.h +++ glibc-2.11.90-1/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) @@ -903,7 +862,7 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.11-12-g24c0bf7/nis/nss +--- glibc-2.11-44-g49c7f27/nis/nss +++ glibc-2.11.90-1/nis/nss @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call @@ -911,9 +870,9 @@ # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-2.11-12-g24c0bf7/nptl/ChangeLog +--- glibc-2.11-44-g49c7f27/nptl/ChangeLog +++ glibc-2.11.90-1/nptl/ChangeLog -@@ -3734,6 +3734,15 @@ +@@ -3761,6 +3761,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -929,7 +888,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4470,6 +4479,11 @@ +@@ -4497,6 +4506,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -941,7 +900,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6544,6 +6558,11 @@ +@@ -6571,6 +6585,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -953,7 +912,7 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.11-12-g24c0bf7/nptl/Makefile +--- glibc-2.11-44-g49c7f27/nptl/Makefile +++ glibc-2.11.90-1/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) @@ -987,7 +946,7 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.11-12-g24c0bf7/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.11-44-g49c7f27/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +++ glibc-2.11.90-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ @@ -997,7 +956,7 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.11-12-g24c0bf7/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11-44-g49c7f27/nptl/sysdeps/unix/sysv/linux/kernel-features.h +++ glibc-2.11.90-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next @@ -1006,7 +965,7 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.11-12-g24c0bf7/nptl/tst-stackguard1.c +--- glibc-2.11-44-g49c7f27/nptl/tst-stackguard1.c +++ glibc-2.11.90-1/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ @@ -1032,7 +991,7 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-12-g24c0bf7/nscd/nscd.conf +--- glibc-2.11-44-g49c7f27/nscd/nscd.conf +++ glibc-2.11.90-1/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log @@ -1043,7 +1002,7 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.11-12-g24c0bf7/nscd/nscd.init +--- glibc-2.11-44-g49c7f27/nscd/nscd.init +++ glibc-2.11.90-1/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. @@ -1116,9 +1075,9 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.11-12-g24c0bf7/posix/Makefile +--- glibc-2.11-44-g49c7f27/posix/Makefile +++ glibc-2.11.90-1/posix/Makefile -@@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ +@@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1138,7 +1097,7 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.11-12-g24c0bf7/posix/getconf.speclist.h +--- glibc-2.11-44-g49c7f27/posix/getconf.speclist.h +++ glibc-2.11.90-1/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include @@ -1180,7 +1139,7 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.11-12-g24c0bf7/streams/Makefile +--- glibc-2.11-44-g49c7f27/streams/Makefile +++ glibc-2.11.90-1/streams/Makefile @@ -21,7 +21,7 @@ # @@ -1191,7 +1150,7 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.11-12-g24c0bf7/sysdeps/generic/dl-cache.h +--- glibc-2.11-44-g49c7f27/sysdeps/generic/dl-cache.h +++ glibc-2.11.90-1/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) @@ -1208,7 +1167,7 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-2.11-12-g24c0bf7/sysdeps/i386/Makefile +--- glibc-2.11-44-g49c7f27/sysdeps/i386/Makefile +++ glibc-2.11.90-1/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). @@ -1234,7 +1193,7 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-12-g24c0bf7/sysdeps/ia64/Makefile +--- glibc-2.11-44-g49c7f27/sysdeps/ia64/Makefile +++ glibc-2.11.90-1/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing @@ -1247,7 +1206,7 @@ endif endif ---- glibc-2.11-12-g24c0bf7/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11-44-g49c7f27/sysdeps/ia64/ia64libgcc.S +++ glibc-2.11.90-1/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency @@ -1600,7 +1559,7 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.11-12-g24c0bf7/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11-44-g49c7f27/sysdeps/ia64/libgcc-compat.c +++ glibc-2.11.90-1/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility @@ -1687,7 +1646,7 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.11-12-g24c0bf7/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11-44-g49c7f27/sysdeps/powerpc/powerpc64/Makefile +++ glibc-2.11.90-1/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. @@ -1697,7 +1656,7 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/nice.c +--- glibc-2.11-44-g49c7f27/sysdeps/unix/nice.c +++ glibc-2.11.90-1/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); @@ -1713,7 +1672,7 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/check_pf.c +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include @@ -1730,7 +1689,7 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/dl-osinfo.h +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA @@ -1779,79 +1738,7 @@ } else #endif ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/fcntl.c -+++ glibc-2.11.90-1/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. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -23,40 +23,6 @@ - #include - - #include --#include -- -- --#ifdef __ASSUME_F_GETOWN_EX --# define miss_F_GETOWN_EX 0 --#else --static int miss_F_GETOWN_EX; --#endif -- -- --static int --do_fcntl (int fd, int cmd, void *arg) --{ -- if (cmd != F_GETOWN || miss_F_GETOWN_EX) -- return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); -- -- INTERNAL_SYSCALL_DECL (err); -- struct f_owner_ex fex; -- int res = INTERNAL_SYSCALL (fcntl, err, 3, fd, F_GETOWN_EX, &fex); -- if (!INTERNAL_SYSCALL_ERROR_P (res, err)) -- return fex.type == F_OWNER_GID ? -fex.pid : fex.pid; -- --#ifndef __ASSUME_F_GETOWN_EX -- if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL) -- { -- res = INLINE_SYSCALL (fcntl, 3, fd, F_GETOWN, arg); -- miss_F_GETOWN_EX = 1; -- return res; -- } --#endif -- -- __set_errno (INTERNAL_SYSCALL_ERRNO (res, err)); -- return -1; --} - - - #ifndef NO_CANCELLATION -@@ -70,7 +36,7 @@ __fcntl_nocancel (int fd, int cmd, ...) - arg = va_arg (ap, void *); - va_end (ap); - -- return do_fcntl (fd, cmd, arg); -+ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); - } - #endif - -@@ -86,11 +52,11 @@ __libc_fcntl (int fd, int cmd, ...) - va_end (ap); - - if (SINGLE_THREAD_P || cmd != F_SETLKW) -- return do_fcntl (fd, cmd, arg); -+ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); - - int oldtype = LIBC_CANCEL_ASYNC (); - -- int result = do_fcntl (fd, cmd, arg); -+ int result = INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); - - LIBC_CANCEL_RESET (oldtype); - ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/futimesat.c +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { @@ -1895,58 +1782,7 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/i386/bits/fcntl.h -+++ glibc-2.11.90-1/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 -+ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -85,15 +85,13 @@ - #define F_SETLKW64 14 /* Set record locking info (blocking). */ - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -168,23 +166,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/i386/clone.S +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/i386/clone.S @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1966,7 +1802,7 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/i386/dl-cache.h +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. @@ -2028,107 +1864,7 @@ + } while (0) + +#include_next ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/i386/fcntl.c -+++ glibc-2.11.90-1/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. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -30,13 +30,6 @@ - int __have_no_fcntl64; - #endif - --#ifdef __ASSUME_F_GETOWN_EX --# define miss_F_GETOWN_EX 0 --#else --static int miss_F_GETOWN_EX; --#endif -- -- - #if defined NO_CANCELLATION && __ASSUME_FCNTL64 == 0 - # define __fcntl_nocancel __libc_fcntl - #endif -@@ -126,26 +119,6 @@ __fcntl_nocancel (int fd, int cmd, ...) - assert (F_SETLK - F_SETLKW == F_SETLK64 - F_SETLKW64); - return INLINE_SYSCALL (fcntl, 3, fd, cmd + F_SETLK - F_SETLK64, &fl); - } -- case F_GETOWN: -- if (! miss_F_GETOWN_EX) -- { -- INTERNAL_SYSCALL_DECL (err); -- struct f_owner_ex fex; -- int res = INTERNAL_SYSCALL (fcntl, err, 3, fd, F_GETOWN_EX, &fex); -- if (!INTERNAL_SYSCALL_ERROR_P (res, err)) -- return fex.type == F_OWNER_GID ? -fex.pid : fex.pid; -- --#ifndef __ASSUME_F_GETOWN_EX -- if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL) -- miss_F_GETOWN_EX = 1; -- else --#endif -- { -- __set_errno (INTERNAL_SYSCALL_ERRNO (res, err)); -- return -1; -- } -- } -- /* FALLTHROUGH */ - default: - return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); - } ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h -+++ glibc-2.11.90-1/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. -+ Copyright (C) 1999, 2000, 2004, 2006, 2007 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 -@@ -81,15 +81,13 @@ - #define F_SETLKW64 7 /* Set record locking info (blocking). */ - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -161,23 +159,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/ia64/dl-cache.h +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ @@ -2162,7 +1898,7 @@ + } while (0) + #include_next ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig @@ -2170,7 +1906,7 @@ +#else +#include +#endif ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig @@ -2178,23 +1914,12 @@ +#else +#include +#endif ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +++ glibc-2.11.90-1/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-12-g24c0bf7/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/kernel-features.h -@@ -542,8 +542,3 @@ - # define __ASSUME_PREADV 1 - # define __ASSUME_PWRITEV 1 - #endif -- --/* Support for F_GETOWN_EX was introduced in 2.6.32. */ --#if __LINUX_KERNEL_VERSION >= 0x020620 --# define __ASSUME_F_GETOWN_EX 1 --#endif ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/netlinkaccess.h +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ @@ -2221,7 +1946,7 @@ struct netlink_res { ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/paths.h +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" @@ -2232,213 +1957,7 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h -+++ glibc-2.11.90-1/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 -+ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -85,15 +85,13 @@ - #define F_SETLKW64 14 /* Set record locking info (blocking). */ - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -168,23 +166,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/s390/bits/fcntl.h -+++ glibc-2.11.90-1/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. -+ Copyright (C) 2000,2001,2002,2004,2006,2007 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 -@@ -100,15 +100,13 @@ - #endif - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -183,23 +181,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/sh/bits/fcntl.h -+++ glibc-2.11.90-1/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 -+ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -85,15 +85,13 @@ - #define F_SETLKW64 14 /* Set record locking info (blocking). */ - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving of SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving of SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -168,23 +166,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h -+++ glibc-2.11.90-1/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 -+ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -83,8 +83,8 @@ - #define F_GETFL 3 /* Get file status flags. */ - #define F_SETFL 4 /* Set file status flags. */ - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_GETOWN 5 /* Get owner (process receiving SIGIO). */ --# define F_SETOWN 6 /* Set owner (process receiving SIGIO). */ -+# define F_GETOWN 5 /* Get owner of socket (receiver of SIGIO). */ -+# define F_SETOWN 6 /* Set owner of socket (receiver of SIGIO). */ - #endif - #ifndef __USE_FILE_OFFSET64 - # define F_GETLK 7 /* Get record locking info. */ -@@ -99,8 +99,6 @@ - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_GETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_SETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -187,23 +185,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/tcsetattr.c +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { @@ -2485,58 +2004,7 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h -+++ glibc-2.11.90-1/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. -+ Copyright (C) 2001, 2002, 2004, 2006, 2007 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 -@@ -99,15 +99,13 @@ - #endif - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -182,23 +180,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD ---- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/x86_64/clone.S +++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2556,7 +2024,7 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.11-12-g24c0bf7/timezone/zic.c +--- glibc-2.11-44-g49c7f27/timezone/zic.c +++ glibc-2.11.90-1/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) diff --git a/glibc.spec b/glibc.spec index fd4bcf4..6770f2a 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.11-12-g24c0bf7 +%define glibcsrcdir glibc-2.11-44-g49c7f27 %define glibcversion 2.11.90 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -18,13 +18,13 @@ %endif %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x %define debuginfocommonarches alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v -%define multiarcharches %{ix86} x86_64 +%define multiarcharches ppc ppc64 %{ix86} x86_64 %define _unpackaged_files_terminate_build 0 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 @@ -61,8 +61,13 @@ BuildRequires: gcc >= 3.2 %endif %ifarch %{multiarcharches} # Need STT_IFUNC support +%ifarch ppc ppc64 +BuildRequires: binutils >= 2.20.51.0.2 +Conflicts: binutils < 2.20.51.0.2 +%else BuildRequires: binutils >= 2.19.51.0.10 Conflicts: binutils < 2.19.51.0.10 +%endif # Earlier releases have broken support for IRELATIVE relocations Conflicts: prelink < 0.4.2 %else @@ -1028,6 +1033,21 @@ rm -f *.filelist* %endif %changelog +* Tue Nov 24 2009 Andreas Schwab - 2.11.90-2 +- Update from master. + - Define week, first_weekday, and first_workday for en_DK locale (#525126). + - Use struct timespec for timestamps in struct stat also if + __USE_XOPEN2K8 (#539870). + - Fix week information for nl_NL locale (#499748). + - Update ntp_gettime for Linux (#479558). + - Fix getwc* and putwc* on non-wide streams (BZ#10958). + - Avoid warnings in CPU_* macros when using const bitsets (BZ#10918). + - Handle LC_GLOBAL_LOCALE in duplocale (BZ#10969). + - Fix _NC_LOCALE_NAME definition (BZ#10968). + - Add missing Linux MADV_* definitions (BZ#10972). + - Add support for new Linux error ERFKILL (BZ#10939). +- Enable multi-arch support on ppc and ppc64. + * Thu Nov 12 2009 Andreas Schwab - 2.11.90-1 - Update from master. diff --git a/import.log b/import.log index 918e0d4..7f886b3 100644 --- a/import.log +++ b/import.log @@ -33,3 +33,4 @@ glibc-2_10_90-22:HEAD:glibc-2.10.90-22.src.rpm:1252930886 glibc-2_10_90-23:HEAD:glibc-2.10.90-23.src.rpm:1253528881 glibc-2_10_90-24:HEAD:glibc-2.10.90-24.src.rpm:1254140947 glibc-2_11_90-1:HEAD:glibc-2.11.90-1.src.rpm:1258048159 +glibc-2_11_90-2:HEAD:glibc-2.11.90-2.src.rpm:1259077749 diff --git a/sources b/sources index 59dc4da..22a55ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e3f0405ffd8cdb72da2ae382cdc85697 glibc-2.11-12-g24c0bf7-fedora.tar.bz2 -6b1673df005832948288a326df0a8bbe glibc-2.11-12-g24c0bf7.tar.bz2 +5e39f649a302de54783cb17ae26dbc6e glibc-2.11-44-g49c7f27-fedora.tar.bz2 +9a5fba87ba34ff4bf5853307b6ac4659 glibc-2.11-44-g49c7f27.tar.bz2