about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2017-09-03 14:33:35 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2017-09-03 14:33:35 +0200
commitcae3d71212ff1885d9317c22411fe97ccd99e287 (patch)
tree8e27b555baf998a418735a4fbc9cda23c7b592e1
parent77e7ba3201365565a21b42979b8d44be9936f254 (diff)
downloadglibc-cae3d71212ff1885d9317c22411fe97ccd99e287.tar.gz
glibc-cae3d71212ff1885d9317c22411fe97ccd99e287.tar.xz
glibc-cae3d71212ff1885d9317c22411fe97ccd99e287.zip
hurd: Fix rtld's strtoul_internal use through hurdlookup
	* sysdeps/mach/hurd/dl-sysdep.c (__strtoul_internal): New
	function.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c9
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 25ea83f601..4802f7c428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,8 +18,8 @@
 	Fix <unistd.h> inclusion.
 	* sysdeps/posix/pwritev2.c: Include <errno.h>.
 	* sysdeps/posix/pwritev64v2.c: Include <errno.h>.
-	* sysdeps/mach/hurd/dl-sysdep.c (__access_noerrno, __sbrk): New
-	functions.
+	* sysdeps/mach/hurd/dl-sysdep.c (__access_noerrno, __sbrk,
+	__strtoul_internal): New functions.
 	* sysdeps/posix/pause.c: Include <sigsetops.h>.
 	* sysdeps/posix/system.c: Include <sigsetops.h>.
 	* sysdeps/mach/hurd/i386/Makefile
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)
 {