[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4182 - in glibc-package/branches/eglibc-2.11/debian/patches: . hppa



Author: schizo
Date: 2010-02-10 02:58:37 +0000 (Wed, 10 Feb 2010)
New Revision: 4182

Added:
   glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-ELF_MACHINE_BEFORE_RTLD_RELOC.diff
   glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-_dl_fptr_init.diff
Removed:
   glibc-package/branches/eglibc-2.11/debian/patches/hppa/ELF_MACHINE_BEFORE_RTLD_RELOC.diff
   glibc-package/branches/eglibc-2.11/debian/patches/hppa/_dl_fptr_init.diff
Modified:
   glibc-package/branches/eglibc-2.11/debian/patches/series
Log:
use better patch names

Deleted: glibc-package/branches/eglibc-2.11/debian/patches/hppa/ELF_MACHINE_BEFORE_RTLD_RELOC.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/hppa/ELF_MACHINE_BEFORE_RTLD_RELOC.diff	2010-02-10 02:56:57 UTC (rev 4181)
+++ glibc-package/branches/eglibc-2.11/debian/patches/hppa/ELF_MACHINE_BEFORE_RTLD_RELOC.diff	2010-02-10 02:58:37 UTC (rev 4182)
@@ -1,12 +0,0 @@
---- a/ports/sysdeps/hppa/dl-machine.h
-+++ b/ports/sysdeps/hppa/dl-machine.h
-@@ -64,7 +64,8 @@ __hppa_init_bootstrap_fdesc_table (struct link_map *map)
- }
- 
- #define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info)		\
--	__hppa_init_bootstrap_fdesc_table (&bootstrap_map);
-+	__hppa_init_bootstrap_fdesc_table (&bootstrap_map);	\
-+	_dl_fptr_init();
- 
- /* Return nonzero iff ELF header is compatible with the running host.  */
- static inline int

Deleted: glibc-package/branches/eglibc-2.11/debian/patches/hppa/_dl_fptr_init.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/hppa/_dl_fptr_init.diff	2010-02-10 02:56:57 UTC (rev 4181)
+++ glibc-package/branches/eglibc-2.11/debian/patches/hppa/_dl_fptr_init.diff	2010-02-10 02:58:37 UTC (rev 4182)
@@ -1,53 +0,0 @@
-diff --git a/elf/dl-fptr.c b/elf/dl-fptr.c
-index e068124..036e9d6 100644
---- a/elf/dl-fptr.c
-+++ b/elf/dl-fptr.c
-@@ -1,5 +1,5 @@
- /* Manage function descriptors.  Generic version.
--   Copyright (C) 1999-2004, 2006 Free Software Foundation, Inc.
-+   Copyright (C) 1999-2004, 2006, 2010 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
-@@ -56,7 +56,8 @@ static struct local
-   }
- local =
-   {
--    .root = &local.boot_table,
-+    /* Address of .boot_table is not known until runtime.  */
-+    .root = 0,
-     .npages = 2,
-     .boot_table =
-       {
-@@ -93,6 +94,17 @@ new_fdesc_table (struct local *l, size_t *size)
-   return new_table;
- }
- 
-+/* Must call _dl_fptr_init before using any other function.  */
-+void 
-+_dl_fptr_init (void)
-+{
-+  struct local *l;
-+
-+  ELF_MACHINE_LOAD_ADDRESS (l, local);
-+  /* Initialize root once.  */
-+  if (__builtin_expect (l->root == 0, 0))
-+    l->root = &l->boot_table;
-+}
- 
- static ElfW(Addr)
- make_fdesc (ElfW(Addr) ip, ElfW(Addr) gp)
-diff --git a/sysdeps/generic/dl-fptr.h b/sysdeps/generic/dl-fptr.h
-index d47fb7b..b957fbb 100644
---- a/sysdeps/generic/dl-fptr.h
-+++ b/sysdeps/generic/dl-fptr.h
-@@ -40,6 +40,9 @@ struct link_map;
- 
- extern ElfW(Addr) _dl_boot_fptr_table [];
- 
-+/* Must be called before any other function.  */
-+extern void _dl_fptr_init (void);
-+
- extern ElfW(Addr) _dl_make_fptr (struct link_map *, const ElfW(Sym) *,
- 				 ElfW(Addr));
- 

Copied: glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-ELF_MACHINE_BEFORE_RTLD_RELOC.diff (from rev 4180, glibc-package/branches/eglibc-2.11/debian/patches/hppa/ELF_MACHINE_BEFORE_RTLD_RELOC.diff)
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-ELF_MACHINE_BEFORE_RTLD_RELOC.diff	                        (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-ELF_MACHINE_BEFORE_RTLD_RELOC.diff	2010-02-10 02:58:37 UTC (rev 4182)
@@ -0,0 +1,12 @@
+--- a/ports/sysdeps/hppa/dl-machine.h
++++ b/ports/sysdeps/hppa/dl-machine.h
+@@ -64,7 +64,8 @@ __hppa_init_bootstrap_fdesc_table (struct link_map *map)
+ }
+ 
+ #define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info)		\
+-	__hppa_init_bootstrap_fdesc_table (&bootstrap_map);
++	__hppa_init_bootstrap_fdesc_table (&bootstrap_map);	\
++	_dl_fptr_init();
+ 
+ /* Return nonzero iff ELF header is compatible with the running host.  */
+ static inline int

Copied: glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-_dl_fptr_init.diff (from rev 4180, glibc-package/branches/eglibc-2.11/debian/patches/hppa/_dl_fptr_init.diff)
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-_dl_fptr_init.diff	                        (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-_dl_fptr_init.diff	2010-02-10 02:58:37 UTC (rev 4182)
@@ -0,0 +1,53 @@
+diff --git a/elf/dl-fptr.c b/elf/dl-fptr.c
+index e068124..036e9d6 100644
+--- a/elf/dl-fptr.c
++++ b/elf/dl-fptr.c
+@@ -1,5 +1,5 @@
+ /* Manage function descriptors.  Generic version.
+-   Copyright (C) 1999-2004, 2006 Free Software Foundation, Inc.
++   Copyright (C) 1999-2004, 2006, 2010 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
+@@ -56,7 +56,8 @@ static struct local
+   }
+ local =
+   {
+-    .root = &local.boot_table,
++    /* Address of .boot_table is not known until runtime.  */
++    .root = 0,
+     .npages = 2,
+     .boot_table =
+       {
+@@ -93,6 +94,17 @@ new_fdesc_table (struct local *l, size_t *size)
+   return new_table;
+ }
+ 
++/* Must call _dl_fptr_init before using any other function.  */
++void 
++_dl_fptr_init (void)
++{
++  struct local *l;
++
++  ELF_MACHINE_LOAD_ADDRESS (l, local);
++  /* Initialize root once.  */
++  if (__builtin_expect (l->root == 0, 0))
++    l->root = &l->boot_table;
++}
+ 
+ static ElfW(Addr)
+ make_fdesc (ElfW(Addr) ip, ElfW(Addr) gp)
+diff --git a/sysdeps/generic/dl-fptr.h b/sysdeps/generic/dl-fptr.h
+index d47fb7b..b957fbb 100644
+--- a/sysdeps/generic/dl-fptr.h
++++ b/sysdeps/generic/dl-fptr.h
+@@ -40,6 +40,9 @@ struct link_map;
+ 
+ extern ElfW(Addr) _dl_boot_fptr_table [];
+ 
++/* Must be called before any other function.  */
++extern void _dl_fptr_init (void);
++
+ extern ElfW(Addr) _dl_make_fptr (struct link_map *, const ElfW(Sym) *,
+ 				 ElfW(Addr));
+ 

Modified: glibc-package/branches/eglibc-2.11/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series	2010-02-10 02:56:57 UTC (rev 4181)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series	2010-02-10 02:58:37 UTC (rev 4182)
@@ -76,8 +76,8 @@
 hppa/submitted-nptl-carlos.diff
 hppa/cvs-nptl-compat.diff
 hppa/local-stack-grows-up.diff
-hppa/_dl_fptr_init.diff
-hppa/ELF_MACHINE_BEFORE_RTLD_RELOC.diff
+hppa/local-_dl_fptr_init.diff
+hppa/local-ELF_MACHINE_BEFORE_RTLD_RELOC.diff
 hppa/local-longjmp-chk.diff
 
 hurd-i386/local-dl-dynamic-weak.diff


Reply to: