r4591 - in glibc-package/branches/eglibc-2.13/debian: . patches patches/alpha
Author: aurel32
Date: 2011-03-26 18:44:03 +0000 (Sat, 26 Mar 2011)
New Revision: 4591
Added:
glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-PTR_MANGLE.diff
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/patches/series
Log:
* Add patches/alpha/submitted-PTR_MANGLE.diff to fix exceptions on alpha.
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-03-23 22:41:39 UTC (rev 4590)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-03-26 18:44:03 UTC (rev 4591)
@@ -140,6 +140,7 @@
and hppa/submitted-libm-hidden.diff to fix FTBFS on hppa.
* Add patches/alpha/submitted-____longjmp_chk.diff to fix longjmp() with
FORTIFY on alpha.
+ * Add patches/alpha/submitted-PTR_MANGLE.diff to fix exceptions on alpha.
[ Samuel Thibault ]
* Add patches/any/cvs-glro_dl_debug_mask.diff to fix build without
Added: glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-PTR_MANGLE.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-PTR_MANGLE.diff (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-PTR_MANGLE.diff 2011-03-26 18:44:03 UTC (rev 4591)
@@ -0,0 +1,36 @@
+2011-03-26 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/alpha/sysdep.h (PTR_MANGLE): Move out of ASSEMBLER
+ ifdef.
+ (PTR_DEMANGLE): Likewise.
+
+--- a/ports/sysdeps/unix/alpha/sysdep.h
++++ b/ports/sysdeps/unix/alpha/sysdep.h
+@@ -157,6 +157,8 @@ __LABEL(name) \
+
+ #else /* !ASSEMBLER */
+
++#include <stdint.h>
++
+ /* ??? Linux needs to be able to override INLINE_SYSCALL for one
+ particular special case. Make this easy. */
+
+@@ -399,11 +401,11 @@ __LABEL(name) \
+ _sc_ret = _sc_0, _sc_err = _sc_19; \
+ }
+
++#endif /* ASSEMBLER */
++
+ /* Pointer mangling support. Note that tls access is slow enough that
+ we don't deoptimize things by placing the pointer check value there. */
+
+-#include <stdint.h>
+-
+ #if defined NOT_IN_libc && defined IS_IN_rtld
+ # ifdef __ASSEMBLER__
+ # define PTR_MANGLE(dst, src, tmp) \
+@@ -447,4 +449,3 @@ extern const uintptr_t __pointer_chk_guard attribute_relro;
+ # endif
+ #endif
+
+-#endif /* ASSEMBLER */
Modified: glibc-package/branches/eglibc-2.13/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series 2011-03-23 22:41:39 UTC (rev 4590)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series 2011-03-26 18:44:03 UTC (rev 4591)
@@ -53,6 +53,7 @@
alpha/submitted-libm-hidden.diff
alpha/submitted-fxstatat.patch
alpha/submitted-____longjmp_chk.diff
+alpha/submitted-PTR_MANGLE.diff
amd64/local-biarch.diff
amd64/local-clone.diff
Reply to: