Author: sthibaul-guest
Date: 2007-11-15 23:12:00 +0000 (Thu, 15 Nov 2007)
New Revision: 2665
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-ptr-mangle.diff
Log:
Use the patch from Thomas Schwinge instead
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-11-15 23:01:19 UTC
(rev 2664)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-11-15 23:12:00 UTC
(rev 2665)
@@ -115,8 +115,7 @@
* Add alpha/submitted-PTR_MANGLE.diff (Closes: #448508).
[ Samuel Thibault ]
- * hurd-i386/submitted-ptr-mangle.diff: Do not define PTR_MANGLE for
- assembly.
+ * hurd-i386/submitted-ptr-mangle.diff: Define PTR_MANGLE for assembly.
-- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 15 Nov 2007 15:47:41 +0100
Modified:
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-ptr-mangle.diff
===================================================================
---
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-ptr-mangle.diff
2007-11-15 23:01:19 UTC (rev 2664)
+++
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-ptr-mangle.diff
2007-11-15 23:12:00 UTC (rev 2665)
@@ -1,15 +1,19 @@
-2007-11-02 Aurelien Jarno <[EMAIL PROTECTED]>
+2007-11-12 Aurelien Jarno <[EMAIL PROTECTED]>
+ Thomas Schwinge <[EMAIL PROTECTED]>
* sysdeps/mach/i386/sysdep.h (PTR_MANGLE, PTR_DEMANGLE): Define.
---- sysdeps/mach/i386/sysdep.h.orig 2007-11-02 08:59:28.560000000 +0100
-+++ sysdeps/mach/i386/sysdep.h 2007-11-02 09:22:12.240000000 +0100
-@@ -58,6 +58,12 @@
+--- sysdeps/mach/i386/sysdep.h.orig
++++ sysdeps/mach/i386/sysdep.h
+@@ -58,6 +58,15 @@
#define STACK_GROWTH_DOWN
-+#ifndef __ASSEMBLER__
+/* Pointer mangling is not yet supported for Hurd. */
++#ifdef __ASSEMBLER__
++#define PTR_MANGLE(var)
++#define PTR_DEMANGLE(var)
++#else
+#define PTR_MANGLE(var) (void) (var)
+#define PTR_DEMANGLE(var) (void) (var)
+#endif
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
