Author: madcoder Date: 2007-06-19 10:27:33 +0000 (Tue, 19 Jun 2007) New Revision: 2381
Added: glibc-package/branches/glibc-2.6/debian/patches/localedata/fix-am_ET.diff Modified: glibc-package/branches/glibc-2.6/debian/changelog glibc-package/branches/glibc-2.6/debian/patches/any/cvs-malloc.diff glibc-package/branches/glibc-2.6/debian/patches/any/cvs-nscd-short-replies.diff glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-defines.diff glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-fatalprepare.diff glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-lowlevellock.diff glibc-package/branches/glibc-2.6/debian/patches/any/local-rtld.diff glibc-package/branches/glibc-2.6/debian/patches/any/local-sysctl.diff glibc-package/branches/glibc-2.6/debian/patches/any/local-tst-mktime2.diff glibc-package/branches/glibc-2.6/debian/patches/any/submitted-strtok.diff glibc-package/branches/glibc-2.6/debian/patches/arm/local-ioperm.diff glibc-package/branches/glibc-2.6/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff glibc-package/branches/glibc-2.6/debian/patches/hppa/local-linuxthreads.diff glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-atomic_h.diff glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-nptl-carlos.diff glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-pie.diff glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff glibc-package/branches/glibc-2.6/debian/patches/locale/preprocessor-collate.diff glibc-package/branches/glibc-2.6/debian/patches/localedata/first_weekday.diff glibc-package/branches/glibc-2.6/debian/patches/localedata/submitted-as_IN.diff glibc-package/branches/glibc-2.6/debian/patches/series glibc-package/branches/glibc-2.6/debian/patches/sparc/local-undefined-registers.diff Log: Fix am_ET (hopefully) and also refresh patches because of the moved hunks. Signed-off-by: Pierre Habouzit <[EMAIL PROTECTED]> Modified: glibc-package/branches/glibc-2.6/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.6/debian/changelog 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/changelog 2007-06-19 10:27:33 UTC (rev 2381) @@ -89,12 +89,15 @@ * nscd.init: ksh is confused if you call functions start or stop. Closes: 428884. * patches/locale/preprocessor-collate.diff: update it to work (with - restrictions) with depth >= 2 copies. + restrictions) with depth >= 2 copies. The patch is scurvy and make locale + parsing completely non reentrant. * debian/control: ${Source-Version} -> ${binary:Version}. * debian/debhelper.in/nscd.lintian: yes, /var/db for lintian is ok. * patches/any/submitted-fileops-and-signals.diff: fixes libio file operations in presence of recoverable errors. Closes: 429021. + * patches/localedata/fix-am_ET.diff: fix am_ET using our preprocessor + extensions. -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 18 Jun 2007 21:02:22 +0200 Modified: glibc-package/branches/glibc-2.6/debian/patches/any/cvs-malloc.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/any/cvs-malloc.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/any/cvs-malloc.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -13,9 +13,11 @@ * malloc/Makefile (CFLAGS-malloc.c): Revert accidental 2007-05-07 commit. ---- libc/malloc/arena.c.jj 2007-05-20 20:01:52.000000000 +0200 -+++ libc/malloc/arena.c 2007-05-21 11:18:13.000000000 +0200 -@@ -370,9 +370,6 @@ ptmalloc_init_minimal (void) +Index: glibc-2.6/malloc/arena.c +=================================================================== +--- glibc-2.6.orig/malloc/arena.c ++++ glibc-2.6/malloc/arena.c +@@ -370,9 +370,6 @@ mp_.top_pad = DEFAULT_TOP_PAD; #endif mp_.n_mmaps_max = DEFAULT_MMAP_MAX; @@ -25,9 +27,11 @@ mp_.mmap_threshold = DEFAULT_MMAP_THRESHOLD; mp_.trim_threshold = DEFAULT_TRIM_THRESHOLD; mp_.pagesize = malloc_getpagesize; ---- libc/malloc/malloc.c.jj 2007-05-20 20:01:52.000000000 +0200 -+++ libc/malloc/malloc.c 2007-05-21 11:19:32.000000000 +0200 -@@ -2358,9 +2358,6 @@ struct malloc_par { +Index: glibc-2.6/malloc/malloc.c +=================================================================== +--- glibc-2.6.orig/malloc/malloc.c ++++ glibc-2.6/malloc/malloc.c +@@ -2358,9 +2358,6 @@ /* Memory map support */ int n_mmaps; int n_mmaps_max; @@ -37,7 +41,7 @@ int max_n_mmaps; /* the mmap_threshold is dynamic, until the user sets it manually, at which point we need to disable any -@@ -2876,8 +2873,6 @@ static void do_check_malloc_state(mstate +@@ -2876,8 +2873,6 @@ assert(total <= (unsigned long)(mp_.max_total_mem)); assert(mp_.n_mmaps >= 0); #endif @@ -46,7 +50,7 @@ assert(mp_.n_mmaps <= mp_.max_n_mmaps); assert((unsigned long)(av->system_mem) <= -@@ -3475,13 +3470,6 @@ munmap_chunk(p) mchunkptr p; +@@ -3475,13 +3470,6 @@ } mp_.n_mmaps--; @@ -60,7 +64,7 @@ mp_.mmapped_mem -= total_size; int ret __attribute__ ((unused)) = munmap((char *)block, total_size); -@@ -5397,9 +5385,6 @@ mstate av; size_t n_elements; size_t* si +@@ -5397,9 +5385,6 @@ mp_.n_mmaps_max = 0; mem = _int_malloc(av, size); mp_.n_mmaps_max = mmx; /* reset mmap */ @@ -70,7 +74,7 @@ if (mem == 0) return 0; -@@ -5725,17 +5710,8 @@ int mALLOPt(param_number, value) int par +@@ -5725,17 +5710,8 @@ res = 0; else #endif @@ -90,9 +94,11 @@ break; case M_CHECK_ACTION: ---- libc/malloc/hooks.c.jj 2007-05-20 20:01:52.000000000 +0200 -+++ libc/malloc/hooks.c 2007-05-21 11:18:13.000000000 +0200 -@@ -496,7 +496,7 @@ free_starter(mem, caller) Void_t* mem; c +Index: glibc-2.6/malloc/hooks.c +=================================================================== +--- glibc-2.6.orig/malloc/hooks.c ++++ glibc-2.6/malloc/hooks.c +@@ -496,7 +496,7 @@ then the hooks are reset to 0. */ #define MALLOC_STATE_MAGIC 0x444c4541l @@ -101,7 +107,7 @@ struct malloc_save_state { long magic; -@@ -507,9 +507,6 @@ struct malloc_save_state { +@@ -507,9 +507,6 @@ unsigned long trim_threshold; unsigned long top_pad; unsigned int n_mmaps_max; @@ -111,7 +117,7 @@ unsigned long mmap_threshold; int check_action; unsigned long max_sbrked_mem; -@@ -553,9 +550,6 @@ public_gET_STATe(void) +@@ -553,9 +550,6 @@ ms->trim_threshold = mp_.trim_threshold; ms->top_pad = mp_.top_pad; ms->n_mmaps_max = mp_.n_mmaps_max; @@ -121,7 +127,7 @@ ms->mmap_threshold = mp_.mmap_threshold; ms->check_action = check_action; ms->max_sbrked_mem = main_arena.max_system_mem; -@@ -601,8 +595,9 @@ public_sET_STATe(Void_t* msptr) +@@ -601,8 +595,9 @@ assert(ms->av[2*i+3] == 0); first(b) = last(b) = b; } else { @@ -133,7 +139,7 @@ first(b) = ms->av[2*i+2]; last(b) = ms->av[2*i+3]; /* Make sure the links to the bins within the heap are correct. */ -@@ -622,14 +617,22 @@ public_sET_STATe(Void_t* msptr) +@@ -622,14 +617,22 @@ } } } @@ -159,9 +165,11 @@ mp_.mmap_threshold = ms->mmap_threshold; check_action = ms->check_action; main_arena.max_system_mem = ms->max_sbrked_mem; ---- libc/malloc/Makefile.jj 2007-04-30 11:51:54.000000000 +0200 -+++ libc/malloc/Makefile 2007-05-21 11:20:41.000000000 +0200 -@@ -104,7 +104,6 @@ $(objpfx)memusagestat: $(memusagestat-mo +Index: glibc-2.6/malloc/Makefile +=================================================================== +--- glibc-2.6.orig/malloc/Makefile ++++ glibc-2.6/malloc/Makefile +@@ -104,7 +104,6 @@ include ../Rules CFLAGS-mcheck-init.c = $(PIC-ccflag) @@ -169,6 +177,3 @@ $(objpfx)libmcheck.a: $(objpfx)mcheck-init.o -rm -f $@ - - Jakub - Modified: glibc-package/branches/glibc-2.6/debian/patches/any/cvs-nscd-short-replies.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/any/cvs-nscd-short-replies.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/any/cvs-nscd-short-replies.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -10,9 +10,10 @@ RCS file: /cvs/glibc/libc/nscd/nscd_helper.c,v retrieving revision 1.22 retrieving revision 1.24 -diff -u -r1.22 -r1.24 ---- libc/nscd/nscd_helper.c 2007/02/16 06:34:19 1.22 -+++ libc/nscd/nscd_helper.c 2007/05/29 15:04:02 1.24 +Index: glibc-2.6/nscd/nscd_helper.c +=================================================================== +--- glibc-2.6.orig/nscd/nscd_helper.c ++++ glibc-2.6/nscd/nscd_helper.c @@ -269,11 +269,12 @@ != keylen, 0)) goto out_close2; Modified: glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-defines.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-defines.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-defines.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -2,8 +2,10 @@ linuxthreads still uses these defines apply only for glibc 2.6 and above ---- config.make.in 2007-05-26 01:36:34.000000000 +0200 -+++ config.make.in 2007-05-26 01:36:34.000000000 +0200 +Index: config.make.in +=================================================================== +--- config.make.in.orig ++++ config.make.in @@ -38,6 +38,11 @@ all-warnings = @all_warnings@ Modified: glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-fatalprepare.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-fatalprepare.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-fatalprepare.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -1,5 +1,7 @@ ---- linuxthreads/sysdeps/unix/sysv/linux/fatal-prepare.h 2007-05-05 22:37:06.310788953 +0200 -+++ linuxthreads/sysdeps/unix/sysv/linux/fatal-prepare.h 2007-05-23 23:24:40.000000000 +0200 +Index: linuxthreads/sysdeps/unix/sysv/linux/fatal-prepare.h +=================================================================== +--- /dev/null ++++ linuxthreads/sysdeps/unix/sysv/linux/fatal-prepare.h @@ -0,0 +1,39 @@ +/* Copyright (C) 2003, 2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. Modified: glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-lowlevellock.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-lowlevellock.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/any/local-linuxthreads-lowlevellock.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -1,5 +1,7 @@ ---- linuxthreads/sysdeps/unix/sysv/linux/rtld-lowlevel.h 1970-01-01 01:00:00.000000000 +0100 -+++ linuxthreads/sysdeps/unix/sysv/linux/rtld-lowlevel.h 2007-05-23 16:21:36.000000000 +0200 +Index: linuxthreads/sysdeps/unix/sysv/linux/rtld-lowlevel.h +=================================================================== +--- /dev/null ++++ linuxthreads/sysdeps/unix/sysv/linux/rtld-lowlevel.h @@ -0,0 +1,153 @@ +/* Defintions for lowlevel handling in ld.so. + Copyright (C) 2006 Free Software Foundation, Inc. Modified: glibc-package/branches/glibc-2.6/debian/patches/any/local-rtld.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/any/local-rtld.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/any/local-rtld.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -37,7 +37,7 @@ --- elf/Makefile.orig +++ elf/Makefile @@ -314,7 +314,7 @@ - nm -u $@ | cmp -s /dev/null - + objdump -T $@ | grep 'D. \*UND\*' | cmp -s /dev/null - # interp.c exists just to get this string into the libraries. -CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"' \ Modified: glibc-package/branches/glibc-2.6/debian/patches/any/local-sysctl.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/any/local-sysctl.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/any/local-sysctl.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -42,7 +42,7 @@ #define MAX_PORT 0x10000 -@@ -107,15 +109,25 @@ +@@ -101,15 +103,25 @@ { char systype[256]; int i, n; @@ -74,7 +74,7 @@ } n = readlink (PATH_ARM_SYSTYPE, systype, sizeof (systype) - 1); -@@ -134,8 +146,6 @@ +@@ -128,8 +140,6 @@ } else { Modified: glibc-package/branches/glibc-2.6/debian/patches/any/local-tst-mktime2.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/any/local-tst-mktime2.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/any/local-tst-mktime2.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -1,5 +1,7 @@ ---- time/tst-mktime2.c 2007-05-25 15:12:14.000000000 +0200 -+++ time/tst-mktime2.c 2007-05-25 15:12:14.000000000 +0200 +Index: time/tst-mktime2.c +=================================================================== +--- time/tst-mktime2.c.orig ++++ time/tst-mktime2.c @@ -2,6 +2,7 @@ #include <time.h> #include <stdlib.h> Modified: glibc-package/branches/glibc-2.6/debian/patches/any/submitted-strtok.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/any/submitted-strtok.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/any/submitted-strtok.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -1,5 +1,7 @@ ---- string/strtok.c.orig 2007-05-30 10:06:58.000000000 +0200 -+++ string/strtok.c 2007-05-30 10:07:56.000000000 +0200 +Index: string/strtok.c +=================================================================== +--- string/strtok.c.orig ++++ string/strtok.c @@ -30,7 +30,7 @@ x = strtok(s, "-"); // x = "abc" x = strtok(NULL, "-="); // x = "def" Modified: glibc-package/branches/glibc-2.6/debian/patches/arm/local-ioperm.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/arm/local-ioperm.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/arm/local-ioperm.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -2,8 +2,8 @@ Index: ports/sysdeps/unix/sysv/linux/arm/ioperm.c =================================================================== ---- ports/sysdeps/unix/sysv/linux/arm/ioperm.c.orig 2007-05-22 08:05:51.000000000 +0200 -+++ ports/sysdeps/unix/sysv/linux/arm/ioperm.c 2007-05-22 08:18:10.000000000 +0200 +--- ports/sysdeps/unix/sysv/linux/arm/ioperm.c.orig ++++ ports/sysdeps/unix/sysv/linux/arm/ioperm.c @@ -96,19 +96,13 @@ * values. */ Modified: glibc-package/branches/glibc-2.6/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -3,8 +3,10 @@ * sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define. ---- ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-05-25 01:40:22.000000000 +0200 -+++ ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-05-25 01:41:02.000000000 +0200 +Index: ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h +=================================================================== +--- ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.orig ++++ ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h @@ -126,3 +126,9 @@ # define NO_CANCELLATION 1 Modified: glibc-package/branches/glibc-2.6/debian/patches/hppa/local-linuxthreads.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/hppa/local-linuxthreads.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/hppa/local-linuxthreads.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -1,5 +1,7 @@ ---- ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/lowlevellock.h 1970-01-01 01:00:00.000000000 +0100 -+++ ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/lowlevellock.h 2007-05-23 16:21:07.000000000 +0200 +Index: ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/lowlevellock.h +=================================================================== +--- /dev/null ++++ ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/lowlevellock.h @@ -0,0 +1,298 @@ +/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -299,9 +301,10 @@ + __lll_cond_broadcast (cond) + +#endif /* lowlevellock.h */ -diff -Nurd ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h glibc-2.6/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h ---- ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h 2006-04-19 07:35:34.000000000 +0200 -+++ ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h 2007-05-23 16:19:12.000000000 +0200 +Index: ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h +=================================================================== +--- ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h.orig ++++ ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h @@ -236,3 +236,10 @@ #endif Modified: glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-atomic_h.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-atomic_h.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-atomic_h.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -5,8 +5,10 @@ error -45 (-EDEADLOCK) to workaround a kernel bug (debugging code enabled). ---- ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h.orig 2007-05-20 03:28:39.000000000 +0200 -+++ ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h 2007-05-20 03:24:41.000000000 +0200 +Index: ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h +=================================================================== +--- ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h.orig ++++ ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h @@ -56,10 +56,14 @@ #define LWS_CAS "0" /* Note r31 is the link register */ Modified: glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-nptl-carlos.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-nptl-carlos.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-nptl-carlos.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -1,11 +1,8 @@ Index: elf/elf.h =================================================================== -RCS file: /cvs/glibc/libc/elf/elf.h,v -retrieving revision 1.156 -diff -u -p -r1.156 elf.h ---- elf/elf.h 8 Jan 2007 13:09:54 -0000 1.156 -+++ elf/elf.h 5 Feb 2007 23:25:06 -0000 -@@ -1709,6 +1709,8 @@ typedef Elf32_Addr Elf32_Conflict; +--- elf/elf.h.orig ++++ elf/elf.h +@@ -1710,6 +1710,8 @@ #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */ #define R_PARISC_FPTR64 64 /* 64 bits function address. */ #define R_PARISC_PLABEL32 65 /* 32 bits function address. */ @@ -14,7 +11,7 @@ #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */ #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */ #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */ -@@ -1769,6 +1771,29 @@ typedef Elf32_Addr Elf32_Conflict; +@@ -1770,6 +1772,29 @@ #define R_PARISC_LTOFF_TP16F 229 /* 16 bits LT-TP-rel. address. */ #define R_PARISC_LTOFF_TP16WF 230 /* 16 bits LT-TP-rel. address. */ #define R_PARISC_LTOFF_TP16DF 231 /* 16 bits LT-TP-rel. address. */ @@ -46,12 +43,9 @@ /* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr. */ Index: elf/rtld.c =================================================================== -RCS file: /cvs/glibc/libc/elf/rtld.c,v -retrieving revision 1.369 -diff -u -p -r1.369 rtld.c ---- elf/rtld.c 28 Oct 2006 06:44:04 -0000 1.369 -+++ elf/rtld.c 5 Feb 2007 23:25:07 -0000 -@@ -378,14 +378,14 @@ _dl_start (void *arg) +--- elf/rtld.c.orig ++++ elf/rtld.c +@@ -379,14 +379,14 @@ know it is available. We do not have to clear the memory if we do not have to use the temporary bootstrap_map. Global variables are initialized to zero by default. */ @@ -71,15 +65,11 @@ # endif # if USE___THREAD bootstrap_map.l_tls_modid = 0; - Index: nptl/Makefile =================================================================== -RCS file: /cvs/glibc/libc/nptl/Makefile,v -retrieving revision 1.188 -diff -u -p -r1.188 Makefile ---- nptl/Makefile 8 Sep 2006 10:40:49 -0000 1.188 -+++ nptl/Makefile 6 May 2007 19:08:39 -0000 -@@ -263,9 +263,9 @@ xtests = tst-setuid1 tst-setuid1-static +--- nptl/Makefile.orig ++++ nptl/Makefile +@@ -263,9 +263,9 @@ # Files which must not be linked with libpthread. tests-nolibpthread = tst-unload @@ -92,7 +82,7 @@ distribute = eintr.c tst-cleanup4aux.c -@@ -424,6 +424,35 @@ CFLAGS-tst-cleanupx3.c += -fexceptions +@@ -424,6 +424,35 @@ CFLAGS-tst-cleanupx4.c += -fexceptions CFLAGS-tst-oncex3.c += -fexceptions CFLAGS-tst-oncex4.c += -fexceptions @@ -130,12 +120,9 @@ CFLAGS-tst-initializers1.c = -W -Wall -Werror Index: nptl/pthread_barrier_wait.c =================================================================== -RCS file: /cvs/glibc/libc/nptl/pthread_barrier_wait.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pthread_barrier_wait.c ---- nptl/pthread_barrier_wait.c 28 Oct 2006 05:06:42 -0000 1.1 -+++ nptl/pthread_barrier_wait.c 6 May 2007 19:08:39 -0000 -@@ -62,7 +62,7 @@ pthread_barrier_wait (barrier) +--- nptl/pthread_barrier_wait.c.orig ++++ nptl/pthread_barrier_wait.c +@@ -62,7 +62,7 @@ /* Wait for the event counter of the barrier to change. */ do lll_futex_wait (&ibarrier->curr_event, event); @@ -146,12 +133,9 @@ /* Make sure the init_count is stored locally or in a register. */ Index: nptl/sysdeps/pthread/Makefile =================================================================== -RCS file: /cvs/glibc/libc/nptl/sysdeps/pthread/Makefile,v -retrieving revision 1.8 -diff -u -p -r1.8 Makefile ---- nptl/sysdeps/pthread/Makefile 28 Feb 2006 07:09:41 -0000 1.8 -+++ nptl/sysdeps/pthread/Makefile 6 May 2007 19:08:39 -0000 -@@ -41,7 +41,9 @@ endif +--- nptl/sysdeps/pthread/Makefile.orig ++++ nptl/sysdeps/pthread/Makefile +@@ -41,7 +41,9 @@ ifeq ($(have-forced-unwind),yes) tests += tst-mqueue8x @@ -163,11 +147,8 @@ Index: include/atomic.h =================================================================== -RCS file: /cvs/glibc/libc/include/atomic.h,v -retrieving revision 1.21 -diff -u -p -r1.21 atomic.h ---- include/atomic.h 21 Dec 2006 21:44:00 -0000 1.21 -+++ include/atomic.h 5 Feb 2007 23:25:07 -0000 +--- include/atomic.h.orig ++++ include/atomic.h @@ -174,7 +174,7 @@ __typeof (*(mem)) __atg5_value = (newvalue); \ \ @@ -287,12 +268,9 @@ __atg19_old | __atg19_mask,\ Index: stdio-common/Makefile =================================================================== -RCS file: /cvs/glibc/libc/stdio-common/Makefile,v -retrieving revision 1.99 -diff -u -p -r1.99 Makefile ---- stdio-common/Makefile 22 Jan 2007 16:17:13 -0000 1.99 -+++ stdio-common/Makefile 5 Feb 2007 23:25:09 -0000 -@@ -76,7 +76,7 @@ $(objpfx)tst-printf.out: $(objpfx)tst-pr +--- stdio-common/Makefile.orig ++++ stdio-common/Makefile +@@ -76,7 +76,7 @@ $(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)' endif @@ -303,12 +281,9 @@ CFLAGS-scanf4.c = -Wno-format Index: sunrpc/clnt_udp.c =================================================================== -RCS file: /cvs/glibc/libc/sunrpc/clnt_udp.c,v -retrieving revision 1.33 -diff -u -p -r1.33 clnt_udp.c ---- sunrpc/clnt_udp.c 20 Dec 2005 22:38:40 -0000 1.33 -+++ sunrpc/clnt_udp.c 5 Feb 2007 23:25:09 -0000 -@@ -419,7 +419,7 @@ send_again: +--- sunrpc/clnt_udp.c.orig ++++ sunrpc/clnt_udp.c +@@ -419,7 +419,7 @@ while (inlen < 0 && errno == EINTR); if (inlen < 0) { Modified: glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-pie.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-pie.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/hppa/submitted-pie.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -1,5 +1,7 @@ ---- glibc-2.5/ports/sysdeps/hppa/elf/start.S.orig 2007-06-02 12:27:53.000000000 +0200 -+++ glibc-2.5/ports/sysdeps/hppa/elf/start.S 2007-06-02 12:27:49.000000000 +0200 +Index: glibc-2.6/ports/sysdeps/hppa/elf/start.S +=================================================================== +--- glibc-2.6.orig/ports/sysdeps/hppa/elf/start.S ++++ glibc-2.6/ports/sysdeps/hppa/elf/start.S @@ -96,16 +96,16 @@ #if SHARED Modified: glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-keywords-ordering.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -12,7 +12,7 @@ =================================================================== --- locale/programs/ld-collate.c.orig +++ locale/programs/ld-collate.c -@@ -2720,7 +2720,6 @@ +@@ -2795,7 +2795,6 @@ if (nowtok == tok_copy) { @@ -20,7 +20,7 @@ now = lr_token (ldfile, charmap, result, NULL, verbose); if (now->tok != tok_string) { -@@ -2794,14 +2793,23 @@ +@@ -2869,14 +2868,23 @@ switch (nowtok) { case tok_copy: @@ -48,7 +48,7 @@ lr_ignore_rest (ldfile, 1); break; -@@ -2815,9 +2823,6 @@ +@@ -2890,9 +2898,6 @@ break; } @@ -58,7 +58,7 @@ arg = lr_token (ldfile, charmap, result, NULL, verbose); if (arg->tok != tok_number) goto err_label; -@@ -2838,7 +2843,7 @@ +@@ -2913,7 +2918,7 @@ break; } @@ -67,7 +67,7 @@ goto err_label; arg = lr_token (ldfile, charmap, result, repertoire, verbose); -@@ -2885,7 +2890,7 @@ +@@ -2960,7 +2965,7 @@ break; } @@ -76,7 +76,7 @@ goto err_label; arg = lr_token (ldfile, charmap, result, repertoire, verbose); -@@ -2954,7 +2959,7 @@ +@@ -3029,7 +3034,7 @@ break; } @@ -85,7 +85,7 @@ goto err_label; arg = lr_token (ldfile, charmap, result, repertoire, verbose); -@@ -3102,7 +3107,7 @@ +@@ -3177,7 +3182,7 @@ break; } @@ -94,7 +94,7 @@ goto err_label; arg = lr_token (ldfile, charmap, result, repertoire, verbose); -@@ -3218,7 +3223,7 @@ +@@ -3293,7 +3298,7 @@ break; } @@ -103,7 +103,7 @@ goto err_label; state = 1; -@@ -3390,8 +3395,12 @@ +@@ -3465,8 +3470,12 @@ was_ellipsis = tok_none; } } @@ -118,7 +118,7 @@ state = 3; arg = lr_token (ldfile, charmap, result, repertoire, verbose); -@@ -3526,8 +3535,6 @@ +@@ -3601,8 +3610,6 @@ %s: missing `reorder-end' keyword"), "LC_COLLATE")); state = 4; } @@ -127,7 +127,7 @@ state = 5; /* Get the name of the sections we are adding after. */ -@@ -4073,7 +4080,7 @@ +@@ -4068,7 +4075,7 @@ /* Next we assume `LC_COLLATE'. */ if (!ignore_content) { Modified: glibc-package/branches/glibc-2.6/debian/patches/locale/preprocessor-collate.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/locale/preprocessor-collate.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/locale/preprocessor-collate.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -39,20 +39,17 @@ /* Sparse table of struct element_t *. */ #define TABLE wchead_table #define ELEMENT struct element_t * -@@ -212,6 +230,12 @@ +@@ -212,6 +230,9 @@ /* This value is used when handling ellipsis. */ struct element_t ellipsis_weight; -+ /* Known keywords. */ -+ struct toggle_list_t *defined_keywords; -+ + /* This is a stack of . */ + struct toggle_list_t *flow_control; + /* Known collating elements. */ hash_table elem_table; -@@ -1455,6 +1479,56 @@ +@@ -1455,6 +1476,56 @@ } @@ -109,15 +106,16 @@ static void collate_startup (struct linereader *ldfile, struct localedef_t *locale, struct localedef_t *copy_locale, int ignore_content) -@@ -2613,6 +2687,7 @@ - int ignore_content) - { - struct repertoire_t *repertoire = NULL; -+ struct toggle_list_t *defined_keywords = NULL; - struct locale_collate_t *collate; - struct token *now; - struct token *arg = NULL; -@@ -2644,6 +2719,82 @@ +@@ -2630,6 +2701,8 @@ + */ + int state = 0; + ++ static struct toggle_list_t *defined_keywords = NULL; ++ + /* Get the repertoire we have to use. */ + if (repertoire_name != NULL) + repertoire = repertoire_read (repertoire_name); +@@ -2644,6 +2717,82 @@ } while (nowtok == tok_eol); @@ -200,7 +198,7 @@ if (nowtok == tok_copy) { state = 2; -@@ -3796,6 +3947,125 @@ +@@ -3796,6 +3945,125 @@ repertoire, result, nowtok); break; @@ -218,7 +216,7 @@ + goto err_label; + else + { -+ struct toggle_list_t *runp = collate->defined_keywords; ++ struct toggle_list_t *runp = defined_keywords; + struct toggle_list_t *flow = (struct toggle_list_t *) xcalloc (1, sizeof (*runp)); + flow->name = "ifdef"; + flow->file = ldfile->fname; @@ -259,7 +257,7 @@ + goto err_label; + else + { -+ struct toggle_list_t *runp = collate->defined_keywords; ++ struct toggle_list_t *runp = defined_keywords; + struct toggle_list_t *flow = (struct toggle_list_t *) xcalloc (1, sizeof (*runp)); + flow->name = "ifndef"; + flow->file = ldfile->fname; @@ -326,7 +324,7 @@ case tok_end: /* Next we assume `LC_COLLATE'. */ if (!ignore_content) -@@ -3825,6 +4095,13 @@ +@@ -3825,6 +4093,13 @@ else if (state == 5) WITH_CUR_LOCALE (error (0, 0, _("\ %s: missing `reorder-sections-end' keyword"), "LC_COLLATE")); Modified: glibc-package/branches/glibc-2.6/debian/patches/localedata/first_weekday.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/localedata/first_weekday.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/localedata/first_weekday.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -1244,7 +1244,7 @@ =================================================================== --- localedata/locales/hy_AM.orig +++ localedata/locales/hy_AM -@@ -317,6 +317,8 @@ +@@ -147,6 +147,8 @@ t_fmt "<U0025><U0072>" am_pm "";"" t_fmt_ampm "" Added: glibc-package/branches/glibc-2.6/debian/patches/localedata/fix-am_ET.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/localedata/fix-am_ET.diff (rev 0) +++ glibc-package/branches/glibc-2.6/debian/patches/localedata/fix-am_ET.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -0,0 +1,27 @@ +Index: glibc-2.6/localedata/locales/am_ET +=================================================================== +--- glibc-2.6.orig/localedata/locales/am_ET ++++ glibc-2.6/localedata/locales/am_ET +@@ -58,7 +58,7 @@ + % + % The ETHIOPIC script declaration must come first. + % +-script <ETHIOPIC> ++define USE_ETHIOPIC + % + % Copy the template from ISO/IEC 14651 + % +Index: glibc-2.6/localedata/locales/iso14651_t1_common +=================================================================== +--- glibc-2.6.orig/localedata/locales/iso14651_t1_common ++++ glibc-2.6/localedata/locales/iso14651_t1_common +@@ -50,6 +50,9 @@ + # 2005-11-29, Pablo Saratxaga <[EMAIL PROTECTED]> + + # Déclaration des systèmes d'écriture / Declaration of scripts ++ifdef USE_ETHIOPIC ++script <ETHIOPIC> ++endif + script <SPECIAL> + script <LATIN> + script <TIFINAGH> Modified: glibc-package/branches/glibc-2.6/debian/patches/localedata/submitted-as_IN.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/localedata/submitted-as_IN.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/localedata/submitted-as_IN.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -1,7 +1,9 @@ http://sourceware.org/bugzilla/show_bug.cgi?id=4557 ---- localedata/locales/as_IN.orig 2007-05-26 23:31:17.000000000 +0200 -+++ localedata/locales/as_IN 2007-05-26 23:31:27.000000000 +0200 +Index: localedata/locales/as_IN +=================================================================== +--- localedata/locales/as_IN.orig ++++ localedata/locales/as_IN @@ -596,7 +596,7 @@ <U09CC> <X689A>;<X0005>;<X0005>;IGNORE <U09CD> <X689C>;<X0005>;<X0005>;IGNORE Modified: glibc-package/branches/glibc-2.6/debian/patches/series =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/series 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-06-19 10:27:33 UTC (rev 2381) @@ -34,6 +34,7 @@ localedata/submitted-as_IN.diff -p0 # alpha/submitted-pic.diff -p0 # g: suspended +localedata/fix-am_ET.diff alpha/local-gcc4.1.diff -p0 alpha/submitted-xstat.diff -p0 @@ -47,7 +48,7 @@ hppa/submitted-atomic_h.diff -p0 hppa/submitted-lt.diff -p0 hppa/submitted-nptl-carlos.diff -p0 -hppa/submitted-pie.diff -p1 +hppa/submitted-pie.diff hppa/submitted-ustat.diff -p0 hppa/local-inlining.diff -p0 hppa/local-linuxthreads.diff -p0 @@ -91,8 +92,8 @@ all/local-ru_RU.diff all/local-pt_BR.diff -any/cvs-malloc.diff -p1 -any/cvs-nscd-short-replies.diff -p1 +any/cvs-malloc.diff +any/cvs-nscd-short-replies.diff any/local-notls.diff -p0 any/local-asserth-decls.diff -p0 # any/local-base.diff -p0 # g: suspended Modified: glibc-package/branches/glibc-2.6/debian/patches/sparc/local-undefined-registers.diff =================================================================== --- glibc-package/branches/glibc-2.6/debian/patches/sparc/local-undefined-registers.diff 2007-06-19 09:59:04 UTC (rev 2380) +++ glibc-package/branches/glibc-2.6/debian/patches/sparc/local-undefined-registers.diff 2007-06-19 10:27:33 UTC (rev 2381) @@ -3,8 +3,10 @@ * elf/Makefile: ignore global registers while looking for undefined symbols. ---- elf/Makefile 2007-05-23 16:14:22.000000000 +0200 -+++ elf/Makefile 2007-05-24 08:55:32.000000000 +0200 +Index: elf/Makefile +=================================================================== +--- elf/Makefile.orig ++++ elf/Makefile @@ -311,7 +311,7 @@ $(filter-out $(map-file),$^) $(load-map-file) \ -Wl,-soname=$(rtld-installed-name) -T [EMAIL PROTECTED] @@ -13,4 +15,4 @@ + objdump -T $@ | grep 'D. \*UND\*' | cmp -s /dev/null - # interp.c exists just to get this string into the libraries. - CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \ + CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"' \ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]