r4939 - glibc-package/trunk/debian/patches/hurd-i386
Author: sthibault
Date: 2011-09-04 15:37:13 +0000 (Sun, 04 Sep 2011)
New Revision: 4939
Modified:
glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_stack_end.diff
Log:
Drop part of the patch which does not apply to the Debian source
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_stack_end.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_stack_end.diff 2011-09-04 15:16:58 UTC (rev 4938)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_stack_end.diff 2011-09-04 15:37:13 UTC (rev 4939)
@@ -60,16 +60,3 @@
/* Copy per-thread variables from that temporary
area onto the new cthread stack. */
memcpy (__hurd_threadvar_location_from_sp (0, newsp),
-diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
-index a63151f..a5df5c1 100644
---- a/sysdeps/mach/hurd/dl-sysdep.c
-+++ b/sysdeps/mach/hurd/dl-sysdep.c
-@@ -55,7 +55,7 @@ INTVARDEF(__libc_enable_secure)
- int __libc_multiple_libcs = 0; /* Defining this here avoids the inclusion
- of init-first. */
- /* This variable containts the lowest stack address ever used. */
--void *__libc_stack_end attribute_relro = NULL;
-+void *__libc_stack_end = NULL;
- rtld_hidden_data_def(__libc_stack_end)
- void *_dl_random attribute_relro = NULL; /* TODO */
-
Reply to: