r5719 - in glibc-package/branches/eglibc-2.18/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2013-10-10 05:34:03 +0000 (Thu, 10 Oct 2013)
New Revision: 5719
Removed:
glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/unsubmitted-stack_offset.diff
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/patches/series
Log:
revert r5718 (patches/hurd-i386/unsubmitted-stack_offset.diff: New patch, fixes __hurd_threadvar_stack_offset conflict link failure.), it breaks dlopen
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-10 05:14:28 UTC (rev 5718)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-10 05:34:03 UTC (rev 5719)
@@ -57,8 +57,6 @@
* patches/hurd-i386/libpthread_hurd_cond_wait.diff: Likewise.
* patches/any/unsubmitted-multi_arch.diff: New patch, fixes undefined
reference failure with non-multiarch builds.
- * patches/hurd-i386/unsubmitted-stack_offset.diff: New patch, fixes
- __hurd_threadvar_stack_offset conflict link failure.
-- Adam Conrad <adconrad@ubuntu.com> Sun, 25 Aug 2013 14:59:44 -0600
Deleted: glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/unsubmitted-stack_offset.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/unsubmitted-stack_offset.diff 2013-10-10 05:14:28 UTC (rev 5718)
+++ glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/unsubmitted-stack_offset.diff 2013-10-10 05:34:03 UTC (rev 5719)
@@ -1,16 +0,0 @@
-Defining a version for __hurd_threadvar_stack_offset in both libc.so and ld.so
-seems to lead to a conflict.
-
-Index: eglibc-2.18/sysdeps/mach/hurd/Versions
-===================================================================
---- eglibc-2.18.orig/sysdeps/mach/hurd/Versions 2013-10-10 04:45:12.000000000 +0000
-+++ eglibc-2.18/sysdeps/mach/hurd/Versions 2013-10-10 04:45:50.000000000 +0000
-@@ -16,7 +16,7 @@
- # variables that must be shared with libc
- __hurd_sigthread_stack_base; __hurd_sigthread_stack_end;
- __hurd_sigthread_variables;
-- __hurd_threadvar_stack_mask; __hurd_threadvar_stack_offset;
-+ __hurd_threadvar_stack_mask;
-
- # functions that must be shared with libc
- __close; __getcwd; __getpid;
Modified: glibc-package/branches/eglibc-2.18/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series 2013-10-10 05:14:28 UTC (rev 5718)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series 2013-10-10 05:34:03 UTC (rev 5719)
@@ -127,7 +127,6 @@
hurd-i386/unsubmitted-clock_t_centiseconds.diff
hurd-i386/submitted-startup-pid2.diff
hurd-i386/submitted-path_mounted.diff
-hurd-i386/unsubmitted-stack_offset.diff
i386/local-biarch.diff
i386/local-cmov.diff
Reply to: