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

[glibc] 01/02: debian/patches/any/local-dlfptr.diff: remove, it's not used anymore by HPPA and causes issues on IA64. Closes: #882874.



This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch sid
in repository glibc.

commit 034d2d104f96a76657c8c70e65e23db7d79585cb
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Thu Nov 30 22:07:48 2017 +0100

    debian/patches/any/local-dlfptr.diff: remove, it's not used anymore by HPPA and causes issues on IA64.  Closes: #882874.
---
 debian/changelog                     |  2 ++
 debian/patches/any/local-dlfptr.diff | 50 ------------------------------------
 debian/patches/series                |  1 -
 3 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c7d0d7..9ff4608 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ glibc (2.25-3) UNRELEASED; urgency=medium
     - Fix assertion failure in posix_spawn().  Closes: #882794.
     - Fix missing posix_fadvise64 from static mips64el build. Closes:
       #883186.
+  * debian/patches/any/local-dlfptr.diff: remove, it's not used anymore by
+    HPPA and causes issues on IA64.  Closes: #882874.
 
   [ Samuel Thibault ]
   * libc0.3.symbols.hurd-i386: Update against newer hurd definitions.
diff --git a/debian/patches/any/local-dlfptr.diff b/debian/patches/any/local-dlfptr.diff
deleted file mode 100644
index 31ef633..0000000
--- a/debian/patches/any/local-dlfptr.diff
+++ /dev/null
@@ -1,50 +0,0 @@
----
- elf/dl-fptr.c             |   18 +++++++++++++++++-
- sysdeps/generic/dl-fptr.h |    3 +++
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
---- a/elf/dl-fptr.c
-+++ b/elf/dl-fptr.c
-@@ -55,7 +55,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 =
-       {
-@@ -92,6 +97,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
-@@ -39,6 +39,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));
- 
diff --git a/debian/patches/series b/debian/patches/series
index 8ffaf3d..f027c37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -193,7 +193,6 @@ any/local-nss-overflow.diff
 any/submitted-missing-etc-hosts.diff
 any/submitted-bits-fcntl_h-at.diff
 any/submitted-nptl-invalid-td.patch
-any/local-dlfptr.diff
 any/submitted-string2-strcmp.diff
 any/local-ldconfig-multiarch.diff
 any/local-tst-writev.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: