r1783 - in glibc-package/branches/glibc-2.4/debian: . patches patches/hppa
Author: aurel32
Date: 2006-08-25 15:14:04 +0000 (Fri, 25 Aug 2006)
New Revision: 1783
Added:
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-nptl-carlos.diff
Removed:
glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-pie-relocs.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-tls-relocs.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Replace hppa/cvs-pie-relocs.diff by submitted-nptl-carlos.diff, see
http://lists.parisc-linux.org/pipermail/parisc-linux/2006-July/029549.html.
With this patch, NPTL support *should* be working on hppa.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-24 19:04:39 UTC (rev 1782)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-25 15:14:04 UTC (rev 1783)
@@ -85,10 +85,10 @@
* Update any/submitted-nis-netgrp.diff.
* Remove i386/local-i486_ldt_support.diff (merged upstream).
* Remove ia64/cvs-gcc41-atomic_h.diff (merged upstream).
- * Add hppa/submitted-tls-relocs.diff to add TLS relocations support on hppa.
* Remove hppa/cvs-linesep.diff (merged upstream).
* Remove hppa/cvs-no-ldbl-128 (merged upstream).
- * Remove merged parts from hppa/cvs-pie-relocs.diff.
+ * Replace hppa/cvs-pie-relocs.diff by submitted-nptl-carlos.diff, see
+ http://lists.parisc-linux.org/pipermail/parisc-linux/2006-July/029549.html.
* Remove hppa/local-gcc-4-profile.diff (not necessary anymore).
* Update hppa/local-inlining.diff to reflect the new port add-on.
* Remove hppa/local-remove-mallocdef.diff (not necessary anymore as
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-pie-relocs.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-pie-relocs.diff 2006-08-24 19:04:39 UTC (rev 1782)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-pie-relocs.diff 2006-08-25 15:14:04 UTC (rev 1783)
@@ -1,21 +0,0 @@
-2005-06-10 Randolph Chung <tausq@debian.org>
-
- * elf/elf.h (R_PARISC_PLABEL21L, R_PARISC_PLABEL14R): Define.
-
-===================================================================
-RCS file: /var/lib/cvs/glibc/elf/elf.h,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- elf/elf.h 2005/06/09 01:14:04 1.3
-+++ elf/elf.h 2005/06/10 23:41:20 1.4
-@@ -1703,6 +1703,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. */
-+#define R_PARISC_PLABEL21L 66 /* Left 21 bits of fct ptr. */
-+#define R_PARISC_PLABEL14R 70 /* Left 21 bits of fct ptr. */
- #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. */
-
Added: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-nptl-carlos.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-nptl-carlos.diff 2006-08-24 19:04:39 UTC (rev 1782)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-nptl-carlos.diff 2006-08-25 15:14:04 UTC (rev 1783)
@@ -0,0 +1,73 @@
+Index: elf/elf.h
+===================================================================
+RCS file: /cvs/glibc/libc/elf/elf.h,v
+retrieving revision 1.155
+diff -u -p -r1.155 elf.h
+--- elf/elf.h 10 Jul 2006 21:54:02 -0000 1.155
++++ elf/elf.h 14 Jul 2006 15:27:24 -0000
+@@ -1708,6 +1708,8 @@ typedef Elf32_Addr Elf32_Conflict;
+ #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. */
++#define R_PARISC_PLABEL21L 66 /* Left 21 bits of fdesc address */
++#define R_PARISC_PLABEL14R 70 /* Right 14 bits of fdesc address */
+ #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. */
+@@ -1768,6 +1770,29 @@ typedef Elf32_Addr Elf32_Conflict;
+ #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. */
++
++#define R_PARISC_GNU_VTENTRY 232
++#define R_PARISC_GNU_VTINHERIT 233
++#define R_PARISC_TLS_GD21L 234 /* GD 21-bit left */
++#define R_PARISC_TLS_GD14R 235 /* GD 14-bit right */
++#define R_PARISC_TLS_GDCALL 236 /* GD call to __t_g_a */
++#define R_PARISC_TLS_LDM21L 237 /* LD module 21-bit left */
++#define R_PARISC_TLS_LDM14R 238 /* LD module 14-bit right */
++#define R_PARISC_TLS_LDMCALL 239 /* LD module call to __t_g_a */
++#define R_PARISC_TLS_LDO21L 240 /* LD offset 21-bit left */
++#define R_PARISC_TLS_LDO14R 241 /* LD offset 14-bit right */
++#define R_PARISC_TLS_DTPMOD32 242 /* DTP module 32-bit */
++#define R_PARISC_TLS_DTPMOD64 243 /* DTP module 64-bit */
++#define R_PARISC_TLS_DTPOFF32 244 /* DTP offset 32-bit */
++#define R_PARISC_TLS_DTPOFF64 245 /* DTP offset 32-bit */
++
++#define R_PARISC_TLS_LE21L R_PARISC_TPREL21L
++#define R_PARISC_TLS_LE14R R_PARISC_TPREL14R
++#define R_PARISC_TLS_IE21L R_PARISC_LTOFF_TP21L
++#define R_PARISC_TLS_IE14R R_PARISC_LTOFF_TP14R
++#define R_PARISC_TLS_TPREL32 R_PARISC_TPREL32
++#define R_PARISC_TLS_TPREL64 R_PARISC_TPREL64
++
+ #define R_PARISC_HIRESERVE 255
+
+ /* 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.362
+diff -u -p -r1.362 rtld.c
+--- elf/rtld.c 8 Apr 2006 19:50:51 -0000 1.362
++++ elf/rtld.c 14 Jul 2006 15:27:24 -0000
+@@ -380,14 +380,14 @@ _dl_start (void *arg)
+ 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. */
+-#ifndef DONT_USE_BOOTSTRAP_MAP
++#if !defined DONT_USE_BOOTSTRAP_MAP
+ # ifdef HAVE_BUILTIN_MEMSET
+ __builtin_memset (bootstrap_map.l_info, '\0', sizeof (bootstrap_map.l_info));
+ # else
+- for (size_t cnt = 0;
+- cnt < sizeof (bootstrap_map.l_info) / sizeof (bootstrap_map.l_info[0]);
+- ++cnt)
+- bootstrap_map.l_info[cnt] = 0;
++ /* Clear the whole bootstrap_map structure */
++ for (char *cnt = (char *)&(bootstrap_map);
++ cnt < ((char *)&(bootstrap_map) + sizeof (bootstrap_map));
++ *cnt++ = '\0');
+ # endif
+ #endif
+
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-tls-relocs.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-tls-relocs.diff 2006-08-24 19:04:39 UTC (rev 1782)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-tls-relocs.diff 2006-08-25 15:14:04 UTC (rev 1783)
@@ -1,32 +0,0 @@
---- elf/elf.h 2005-04-05 18:24:53.000000000 -0400
-+++ elf/elf.h 2005-04-05 18:36:08.000000000 -0400
-@@ -1761,6 +1761,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. */
-+
-+#define R_PARISC_GNU_VTENTRY 232
-+#define R_PARISC_GNU_VTINHERIT 233
-+#define R_PARISC_TLS_GD21L 234
-+#define R_PARISC_TLS_GD14R 235
-+#define R_PARISC_TLS_GDCALL 236
-+#define R_PARISC_TLS_LDM21L 237
-+#define R_PARISC_TLS_LDM14R 238
-+#define R_PARISC_TLS_LDMCALL 239
-+#define R_PARISC_TLS_LDO21L 240
-+#define R_PARISC_TLS_LDO14R 241
-+#define R_PARISC_TLS_DTPMOD32 242 /* FIXME: Verify support in dl-machine */
-+#define R_PARISC_TLS_DTPMOD64 243
-+#define R_PARISC_TLS_DTPOFF32 244 /* FIXME: Likewise */
-+#define R_PARISC_TLS_DTPOFF64 245
-+
-+#define R_PARISC_TLS_LE21L R_PARISC_TPREL21L
-+#define R_PARISC_TLS_LE14R R_PARISC_TPREL14R
-+#define R_PARISC_TLS_IE21L R_PARISC_LTOFF_TP21L
-+#define R_PARISC_TLS_IE14R R_PARISC_LTOFF_TP14R
-+#define R_PARISC_TLS_TPREL32 R_PARISC_TPREL32 /* FIXME: Likewise*/
-+#define R_PARISC_TLS_TPREL64 R_PARISC_TPREL64
-+
- #define R_PARISC_HIRESERVE 255
-
- /* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr. */
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-24 19:04:39 UTC (rev 1782)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-25 15:14:04 UTC (rev 1783)
@@ -59,8 +59,7 @@
hppa/local-Rminkernel.diff -p0
hppa/submitted-drop-utimes.diff -p1
hppa/submitted-lt.diff -p1
-hppa/submitted-tls-relocs.diff -p0
-hppa/cvs-pie-relocs.diff -p0
+hppa/submitted-nptl-carlos.diff -p0
hppa/local-inlining.diff -p0
hurd-i386/cvs-machrules-make.diff -p1
Reply to: