/[gentoo]/src/patchsets/glibc/2.11.3/1505_hppa_glibc-2.11-hppa-nptl.patch
Gentoo

Diff of /src/patchsets/glibc/2.11.3/1505_hppa_glibc-2.11-hppa-nptl.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.1 Revision 1.2
1http://bugs.gentoo.org/301642 1http://bugs.gentoo.org/301642
2 2
3diff -uNr glibc-2.11.2.orig/ChangeLog glibc-2.11.2/ChangeLog
4--- glibc-2.11.2.orig/ChangeLog 2010-07-25 21:58:31.317129388 +0200
5+++ glibc-2.11.2/ChangeLog 2010-07-25 22:01:24.035435289 +0200
6@@ -211,6 +211,14 @@
7 * io/ftw.c (ftw_startup): Close descriptor for initial directory
8 after changing back to it.
9
10+2010-02-09 Carlos O'Donell <carlos@codesourcery.com>
11+
12+ * elf/dl-fptr.c: Update copyright year.
13+ (struct local): Don't initialize root.
14+ (make_fdesc): Initialize root table pointer.
15+ (_dl_fptr_init): New function.
16+ * sysdeps/generic/dl-fptr.h (_dl_fptr_init): New prototype.
17+
18 2010-02-09 Ulrich Drepper <drepper@redhat.com>
19
20 * sysdeps/i386/lshift.S: Fix unwind information.
21diff -uNr glibc-2.11.2.orig/elf/dl-fptr.c glibc-2.11.2/elf/dl-fptr.c
22--- glibc-2.11.2.orig/elf/dl-fptr.c 2010-07-25 21:58:31.241131107 +0200 3--- a/elf/dl-fptr.c 2010-07-25 21:58:31.241131107 +0200
23+++ glibc-2.11.2/elf/dl-fptr.c 2010-07-25 22:00:54.323726976 +0200 4+++ b/elf/dl-fptr.c 2010-07-25 22:00:54.323726976 +0200
24@@ -1,5 +1,5 @@ 5@@ -1,5 +1,5 @@
25 /* Manage function descriptors. Generic version. 6 /* Manage function descriptors. Generic version.
26- Copyright (C) 1999-2004, 2006 Free Software Foundation, Inc. 7- Copyright (C) 1999-2004, 2006 Free Software Foundation, Inc.
27+ Copyright (C) 1999-2004, 2006, 2010 Free Software Foundation, Inc. 8+ Copyright (C) 1999-2004, 2006, 2010 Free Software Foundation, Inc.
28 This file is part of the GNU C Library. 9 This file is part of the GNU C Library.
… …
54+ l->root = &l->boot_table; 35+ l->root = &l->boot_table;
55+} 36+}
56 37
57 static ElfW(Addr) 38 static ElfW(Addr)
58 make_fdesc (ElfW(Addr) ip, ElfW(Addr) gp) 39 make_fdesc (ElfW(Addr) ip, ElfW(Addr) gp)
59diff -uNr glibc-2.11.2.orig/nptl/ChangeLog glibc-2.11.2/nptl/ChangeLog
60--- glibc-2.11.2.orig/nptl/ChangeLog 2010-07-25 21:58:30.721135832 +0200
61+++ glibc-2.11.2/nptl/ChangeLog 2010-07-25 22:00:00.884251052 +0200
62@@ -1,3 +1,21 @@
63+2010-02-09 Carlos O'Donell <carlos@codesourcery.com>
64+
65+ * allocatestack.c (allocate_stack): Define
66+ _STACK_GROWS_DOWN and _STACK_GROWS_UP cases for
67+ user defined stacks. Adjust define indentation.
68+ Remove assert for _STACK_GROWS_UP case.
69+ * pthread_create.c: Update coprigyt year.
70+ (start_thread): Implement _STACK_GROWS_UP case.
71+ * pthread_attr_getstack.c: Update copyright year.
72+ (__pthread_attr_getstack): Define _STACK_GROWS_UP
73+ case.
74+ * pthread_attr_setstack.c: Update copyright year.
75+ (__pthread_attr_setstack): Define _STACK_GROWS_UP
76+ case.
77+ (__old_pthread_attr_setstack): Likewise.
78+ * pthread_getattr_np: Update copyright year.
79+ (pthread_getattr_np): Define _STACK_GROWS_UP cases.
80+
81 2009-11-27 Andreas Schwab <schwab@redhat.com>
82
83 * sysdeps/unix/sysv/linux/x86_64/cancellation.S: Reload
84diff -uNr glibc-2.11.2.orig/nptl/allocatestack.c glibc-2.11.2/nptl/allocatestack.c
85--- glibc-2.11.2.orig/nptl/allocatestack.c 2010-07-25 21:58:30.669136153 +0200 40--- a/nptl/allocatestack.c 2010-07-25 21:58:30.669136153 +0200
86+++ glibc-2.11.2/nptl/allocatestack.c 2010-07-25 21:59:05.528795435 +0200 41+++ b/nptl/allocatestack.c 2010-07-25 21:59:05.528795435 +0200
87@@ -1,4 +1,4 @@ 42@@ -1,4 +1,4 @@
88-/* Copyright (C) 2002-2007, 2009 Free Software Foundation, Inc. 43-/* Copyright (C) 2002-2007, 2009 Free Software Foundation, Inc.
89+/* Copyright (C) 2002-2007, 2009, 2010 Free Software Foundation, Inc. 44+/* Copyright (C) 2002-2007, 2009, 2010 Free Software Foundation, Inc.
90 This file is part of the GNU C Library. 45 This file is part of the GNU C Library.
91 Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. 46 Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
… …
157 *stack = pd->stackblock; 112 *stack = pd->stackblock;
158- assert (*stack > 0); 113- assert (*stack > 0);
159 #endif 114 #endif
160 115
161 return 0; 116 return 0;
162diff -uNr glibc-2.11.2.orig/nptl/pthread_attr_getstack.c glibc-2.11.2/nptl/pthread_attr_getstack.c
163--- glibc-2.11.2.orig/nptl/pthread_attr_getstack.c 2010-07-25 21:58:30.717135358 +0200 117--- a/nptl/pthread_attr_getstack.c 2010-07-25 21:58:30.717135358 +0200
164+++ glibc-2.11.2/nptl/pthread_attr_getstack.c 2010-07-25 21:59:05.532796982 +0200 118+++ b/nptl/pthread_attr_getstack.c 2010-07-25 21:59:05.532796982 +0200
165@@ -1,4 +1,4 @@ 119@@ -1,4 +1,4 @@
166-/* Copyright (C) 2002 Free Software Foundation, Inc. 120-/* Copyright (C) 2002 Free Software Foundation, Inc.
167+/* Copyright (C) 2002, 2010 Free Software Foundation, Inc. 121+/* Copyright (C) 2002, 2010 Free Software Foundation, Inc.
168 This file is part of the GNU C Library. 122 This file is part of the GNU C Library.
169 Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. 123 Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
… …
178+ *stackaddr = (char *) iattr->stackaddr; 132+ *stackaddr = (char *) iattr->stackaddr;
179+#endif 133+#endif
180 *stacksize = iattr->stacksize; 134 *stacksize = iattr->stacksize;
181 135
182 return 0; 136 return 0;
183diff -uNr glibc-2.11.2.orig/nptl/pthread_attr_setstack.c glibc-2.11.2/nptl/pthread_attr_setstack.c
184--- glibc-2.11.2.orig/nptl/pthread_attr_setstack.c 2010-07-25 21:58:30.717135358 +0200 137--- a/nptl/pthread_attr_setstack.c 2010-07-25 21:58:30.717135358 +0200
185+++ glibc-2.11.2/nptl/pthread_attr_setstack.c 2010-07-25 21:59:05.532796982 +0200 138+++ b/nptl/pthread_attr_setstack.c 2010-07-25 21:59:05.532796982 +0200
186@@ -1,4 +1,4 @@ 139@@ -1,4 +1,4 @@
187-/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. 140-/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
188+/* Copyright (C) 2002, 2003, 2006, 2010 Free Software Foundation, Inc. 141+/* Copyright (C) 2002, 2003, 2006, 2010 Free Software Foundation, Inc.
189 This file is part of the GNU C Library. 142 This file is part of the GNU C Library.
190 Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. 143 Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
… …
211+ iattr->stackaddr = (char *) stackaddr; 164+ iattr->stackaddr = (char *) stackaddr;
212+#endif 165+#endif
213 iattr->flags |= ATTR_FLAG_STACKADDR; 166 iattr->flags |= ATTR_FLAG_STACKADDR;
214 167
215 return 0; 168 return 0;
216diff -uNr glibc-2.11.2.orig/nptl/pthread_create.c glibc-2.11.2/nptl/pthread_create.c
217--- glibc-2.11.2.orig/nptl/pthread_create.c 2010-07-25 21:58:30.713135617 +0200 169--- a/nptl/pthread_create.c 2010-07-25 21:58:30.713135617 +0200
218+++ glibc-2.11.2/nptl/pthread_create.c 2010-07-25 21:59:05.536794818 +0200 170+++ b/nptl/pthread_create.c 2010-07-25 21:59:05.536794818 +0200
219@@ -1,4 +1,4 @@ 171@@ -1,4 +1,4 @@
220-/* Copyright (C) 2002-2007,2008,2009 Free Software Foundation, Inc. 172-/* Copyright (C) 2002-2007,2008,2009 Free Software Foundation, Inc.
221+/* Copyright (C) 2002-2007,2008,2009,2010 Free Software Foundation, Inc. 173+/* Copyright (C) 2002-2007,2008,2009,2010 Free Software Foundation, Inc.
222 This file is part of the GNU C Library. 174 This file is part of the GNU C Library.
223 Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. 175 Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
… …
242+ madvise (freeblock, freesize - PTHREAD_STACK_MIN, MADV_DONTNEED); 194+ madvise (freeblock, freesize - PTHREAD_STACK_MIN, MADV_DONTNEED);
243+#endif 195+#endif
244 196
245 /* If the thread is detached free the TCB. */ 197 /* If the thread is detached free the TCB. */
246 if (IS_DETACHED (pd)) 198 if (IS_DETACHED (pd))
247diff -uNr glibc-2.11.2.orig/nptl/pthread_getattr_np.c glibc-2.11.2/nptl/pthread_getattr_np.c
248--- glibc-2.11.2.orig/nptl/pthread_getattr_np.c 2010-07-25 21:58:30.713135617 +0200 199--- a/nptl/pthread_getattr_np.c 2010-07-25 21:58:30.713135617 +0200
249+++ glibc-2.11.2/nptl/pthread_getattr_np.c 2010-07-25 21:59:05.536794818 +0200 200+++ b/nptl/pthread_getattr_np.c 2010-07-25 21:59:05.536794818 +0200
250@@ -1,4 +1,5 @@ 201@@ -1,4 +1,5 @@
251-/* Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc. 202-/* Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
252+/* Copyright (C) 2002, 2003, 2004, 2006, 2007, 203+/* Copyright (C) 2002, 2003, 2004, 2006, 2007,
253+ 2010 Free Software Foundation, Inc. 204+ 2010 Free Software Foundation, Inc.
254 This file is part of the GNU C Library. 205 This file is part of the GNU C Library.
… …
286+ iattr->stacksize = to - (size_t) iattr->stackaddr; 237+ iattr->stacksize = to - (size_t) iattr->stackaddr;
287+#endif 238+#endif
288 /* We succeed and no need to look further. */ 239 /* We succeed and no need to look further. */
289 ret = 0; 240 ret = 0;
290 break; 241 break;
291diff -uNr glibc-2.11.2.orig/ports/ChangeLog.hppa glibc-2.11.2/ports/ChangeLog.hppa 242
292--- glibc-2.11.2.orig/ports/ChangeLog.hppa 2010-07-25 21:58:30.213140619 +0200
293+++ glibc-2.11.2/ports/ChangeLog.hppa 2010-07-25 22:02:52.062583751 +0200
294@@ -1,3 +1,8 @@
295+2010-02-09 Carlos O'Donell <carlos@codesourcery.com> 2432010-02-09 Carlos O'Donell <carlos@codesourcery.com>
296+ 244
297+ * sysdeps/hppa/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC): 245 * sysdeps/hppa/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC):
298+ Call _dl_fptr_init. 246 Call _dl_fptr_init.
299+ 247
300 2009-11-15 Carlos O'Donell <carlos@codesourcery.com>
301
302 [BZ #6676]
303diff -uNr glibc-2.11.2.orig/ports/sysdeps/hppa/dl-machine.h glibc-2.11.2/ports/sysdeps/hppa/dl-machine.h
304--- glibc-2.11.2.orig/ports/sysdeps/hppa/dl-machine.h 2010-07-25 21:58:30.189140390 +0200 248--- a/ports/sysdeps/hppa/dl-machine.h 2010-07-25 21:58:30.189140390 +0200
305+++ glibc-2.11.2/ports/sysdeps/hppa/dl-machine.h 2010-07-25 22:02:25.502848298 +0200 249+++ b/ports/sysdeps/hppa/dl-machine.h 2010-07-25 22:02:25.502848298 +0200
306@@ -64,7 +64,8 @@ 250@@ -64,7 +64,8 @@
307 } 251 }
308 252
309 #define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info) \ 253 #define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info) \
310- __hppa_init_bootstrap_fdesc_table (&bootstrap_map); 254- __hppa_init_bootstrap_fdesc_table (&bootstrap_map);
311+ __hppa_init_bootstrap_fdesc_table (&bootstrap_map); \ 255+ __hppa_init_bootstrap_fdesc_table (&bootstrap_map); \
312+ _dl_fptr_init(); 256+ _dl_fptr_init();
313 257
314 /* Return nonzero iff ELF header is compatible with the running host. */ 258 /* Return nonzero iff ELF header is compatible with the running host. */
315 static inline int 259 static inline int
316diff -uNr glibc-2.11.2.orig/sysdeps/generic/dl-fptr.h glibc-2.11.2/sysdeps/generic/dl-fptr.h
317--- glibc-2.11.2.orig/sysdeps/generic/dl-fptr.h 2010-07-25 21:58:30.525138223 +0200 260--- a/sysdeps/generic/dl-fptr.h 2010-07-25 21:58:30.525138223 +0200
318+++ glibc-2.11.2/sysdeps/generic/dl-fptr.h 2010-07-25 22:00:54.323726976 +0200 261+++ b/sysdeps/generic/dl-fptr.h 2010-07-25 22:00:54.323726976 +0200
319@@ -40,6 +40,9 @@ 262@@ -40,6 +40,9 @@
320 263
321 extern ElfW(Addr) _dl_boot_fptr_table []; 264 extern ElfW(Addr) _dl_boot_fptr_table [];
322 265
323+/* Must be called before any other function. */ 266+/* Must be called before any other function. */
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
  ViewVC Help
Powered by ViewVC 1.1.13