r4308 - in glibc-package/trunk/debian/patches: . any hppa
Author: aurel32
Date: 2010-05-31 20:32:40 +0000 (Mon, 31 May 2010)
New Revision: 4308
Added:
glibc-package/trunk/debian/patches/any/local-dlfptr.diff
Modified:
glibc-package/trunk/debian/patches/hppa/local-dlfptr.diff
glibc-package/trunk/debian/patches/series
Log:
Split hppa/local-dlfptr.diff
Added: glibc-package/trunk/debian/patches/any/local-dlfptr.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-dlfptr.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-dlfptr.diff 2010-05-31 20:32:40 UTC (rev 4308)
@@ -0,0 +1,57 @@
+---
+ elf/dl-fptr.c | 18 +++++++++++++++++-
+ sysdeps/generic/dl-fptr.h | 3 +++
+ 3 files changed, 20 insertions(+), 1 deletions(-)
+
+--- 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,12 @@
+ }
+ local =
+ {
++#ifndef SHARED
+ .root = &local.boot_table,
++#else
++ /* Address of .boot_table is not known until runtime. */
++ .root = 0,
++#endif
+ .npages = 2,
+ .boot_table =
+ {
+@@ -93,6 +98,17 @@
+ 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)
+--- a/sysdeps/generic/dl-fptr.h
++++ b/sysdeps/generic/dl-fptr.h
+@@ -40,6 +40,9 @@
+
+ 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/trunk/debian/patches/hppa/local-dlfptr.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/local-dlfptr.diff 2010-05-31 20:29:51 UTC (rev 4307)
+++ glibc-package/trunk/debian/patches/hppa/local-dlfptr.diff 2010-05-31 20:32:40 UTC (rev 4308)
@@ -1,61 +1,7 @@
---
- elf/dl-fptr.c | 18 +++++++++++++++++-
ports/sysdeps/hppa/dl-machine.h | 3 ++-
- sysdeps/generic/dl-fptr.h | 3 +++
- 3 files changed, 22 insertions(+), 2 deletions(-)
+ 1 files changed, 2 insertions(+), 1 deletions(-)
---- 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,12 @@
- }
- local =
- {
-+#ifndef SHARED
- .root = &local.boot_table,
-+#else
-+ /* Address of .boot_table is not known until runtime. */
-+ .root = 0,
-+#endif
- .npages = 2,
- .boot_table =
- {
-@@ -93,6 +98,17 @@
- 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)
---- a/sysdeps/generic/dl-fptr.h
-+++ b/sysdeps/generic/dl-fptr.h
-@@ -40,6 +40,9 @@
-
- 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));
-
--- a/ports/sysdeps/hppa/dl-machine.h
+++ b/ports/sysdeps/hppa/dl-machine.h
@@ -64,7 +64,8 @@
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-05-31 20:29:51 UTC (rev 4307)
+++ glibc-package/trunk/debian/patches/series 2010-05-31 20:32:40 UTC (rev 4308)
@@ -236,3 +236,4 @@
any/cvs-getaddrinfo.diff
any/cvs-umount-nofollow.diff
any/cvs-glob.diff
+any/local-dlfptr.diff
Reply to: