r1962 - in glibc-package/branches/glibc-2.5/debian: . patches patches/kfreebsd
Author: aurel32
Date: 2007-02-08 21:23:52 +0100 (Thu, 08 Feb 2007)
New Revision: 1962
Added:
glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-amd64-dl-machine.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series.kfreebsd-amd64
Log:
* kfreebsd/local-amd64-dl-machine.diff: new patch from Petr Salinger (fix
ld.so segfault on GNU/kFreeBSD amd64).
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-08 20:13:44 UTC (rev 1961)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-08 20:23:52 UTC (rev 1962)
@@ -108,6 +108,8 @@
__libc_once_else to make glibc buildable on Hurd).
* hurd-i386/local-msg-nosignal.diff: new patch from Thomas Schwinge
(workaround the missing MSG_NOSIGNAL support).
+ * kfreebsd/local-amd64-dl-machine.diff: new patch from Petr Salinger (fix
+ ld.so segfault on GNU/kFreeBSD amd64).
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
Added: glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-amd64-dl-machine.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-amd64-dl-machine.diff 2007-02-08 20:13:44 UTC (rev 1961)
+++ glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-amd64-dl-machine.diff 2007-02-08 20:23:52 UTC (rev 1962)
@@ -0,0 +1,16 @@
+
+* probably not kfreebsd specific bug,
+ but I am not sure as ld.so loading is a little magic
+
+
+--- sysdeps/x86_64/dl-machine.h 2005-07-31 19:49:44.000000000 +0200
++++ sysdeps/x86_64/dl-machine.h 2007-02-08 18:14:56.000000000 +0100
+@@ -286,7 +283,7 @@
+ const Elf64_Sym *const refsym = sym;
+ #endif
+ struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
+- Elf64_Addr value = (sym == NULL ? 0
++ Elf64_Addr value = (sym_map == NULL ? 0
+ : (Elf64_Addr) sym_map->l_addr + sym->st_value);
+
+ #if defined RTLD_BOOTSTRAP && !USE___THREAD
Modified: glibc-package/branches/glibc-2.5/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series.kfreebsd-amd64 2007-02-08 20:13:44 UTC (rev 1961)
+++ glibc-package/branches/glibc-2.5/debian/patches/series.kfreebsd-amd64 2007-02-08 20:23:52 UTC (rev 1962)
@@ -1,3 +1,4 @@
+kfreebsd/local-amd64-dl-machine.diff
kfreebsd/local-ftw.diff -p0
kfreebsd/local-memusage_no_mremap.diff -p0
kfreebsd/local-pthread_at_fork.diff -p0
Reply to: