[glibc] 01/01: hurd: Fix ld.so startup
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.26
in repository glibc.
commit f214bf6c3b2846574b32af058df4539151f3f11c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Sep 3 12:38:11 2017 +0000
hurd: Fix ld.so startup
- patches/hurd-i386/git-i386-implies-x86.diff: New patch.
- patches/hurd-i386/git-x86-tunables.diff: New patch.
- patches/hurd-i386/git-rtld-strtoul_internal.diff: New patch.
---
debian/changelog | 3 +++
.../hurd-i386/git-rtld-strtoul_internal.diff | 29 ++++++++++++++++++++++
debian/patches/series | 3 +++
3 files changed, 35 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 7d662d0..aabde94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,9 @@ glibc (2.26-0experimental0~ppa4) UNRELEASED; urgency=medium
- patches/hurd-i386/git-feraiseexcept.diff: New patch.
- patches/hurd-i386/cvs-libpthread.diff: Update.
- patches/hurd-i386/git-libpthread-2.26.diff: New patch.
+ - patches/hurd-i386/git-i386-implies-x86.diff: New patch.
+ - patches/hurd-i386/git-x86-tunables.diff: New patch.
+ - patches/hurd-i386/git-rtld-strtoul_internal.diff: New patch.
-- Adam Conrad <adconrad@0c3.net> Sat, 02 Sep 2017 12:15:10 -0600
diff --git a/debian/patches/hurd-i386/git-rtld-strtoul_internal.diff b/debian/patches/hurd-i386/git-rtld-strtoul_internal.diff
new file mode 100644
index 0000000..20c32b6
--- /dev/null
+++ b/debian/patches/hurd-i386/git-rtld-strtoul_internal.diff
@@ -0,0 +1,29 @@
+commit cae3d71212ff1885d9317c22411fe97ccd99e287
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Sep 3 14:33:35 2017 +0200
+
+ hurd: Fix rtld's strtoul_internal use through hurdlookup
+
+ * sysdeps/mach/hurd/dl-sysdep.c (__strtoul_internal): New
+ function.
+
+diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
+index fd2f3d52cb..517e4d62cc 100644
+--- a/sysdeps/mach/hurd/dl-sysdep.c
++++ b/sysdeps/mach/hurd/dl-sysdep.c
+@@ -602,6 +602,15 @@ __sbrk (intptr_t increment)
+ return (void *) addr;
+ }
+
++unsigned long int
++weak_function
++__strtoul_internal (const char *nptr, char **endptr, int base, int group)
++{
++ assert (base == 0 || base == 10);
++ assert (group == 0);
++ return _dl_strtoul (nptr, endptr);
++}
++
+ void weak_function attribute_hidden
+ _exit (int status)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 48d28bb..8119edf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -143,6 +143,9 @@ hurd-i386/git-rtld-sbrk.diff
hurd-i386/git-divdi.diff
hurd-i386/git-feraiseexcept.diff
hurd-i386/git-libpthread-2.26.diff
+hurd-i386/git-x86-tunables.diff
+hurd-i386/git-i386-implies-x86.diff
+hurd-i386/git-rtld-strtoul_internal.diff
i386/local-biarch.diff
i386/unsubmitted-quiet-ldconfig.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: