[Pkg-xen-changes] [xen] 06/07: arm64 workaround for glibc PSR_MODE_* namespace polution

[Ian Campbell]

This is an automated email from the git hooks/post-receive script.

ijc-guest pushed a commit to branch feature/arm
in repository xen.

commit 6286cdf5095f107c6fa8ce9abca05431e63ff846
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Fri Jul 18 14:19:42 2014 +0100

    arm64 workaround for glibc PSR_MODE_* namespace polution
    
    https://bugs.launchpad.net/linaro-aarch64/+bug/1169164 and #755169
---
 xen/include/public/arch-arm.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h
index 7496556..b2e9d64 100644
--- a/xen/include/public/arch-arm.h
+++ b/xen/include/public/arch-arm.h
@@ -340,7 +340,18 @@ typedef uint64_t xen_callback_t;
 #define PSR_MODE_UND 0x1b
 #define PSR_MODE_SYS 0x1f
 
+/* Workaround: https://bugs.launchpad.net/linaro-aarch64/+bug/1169164 */
+#undef PSR_MODE_BIT
+#undef PSR_MODE_EL3h
+#undef PSR_MODE_EL3t
+#undef PSR_MODE_EL2h
+#undef PSR_MODE_EL2t
+#undef PSR_MODE_EL1h
+#undef PSR_MODE_EL1t
+#undef PSR_MODE_EL0t
+
 /* 64 bit modes */
+
 #define PSR_MODE_BIT  0x10 /* Set iff AArch32 */
 #define PSR_MODE_EL3h 0x0d
 #define PSR_MODE_EL3t 0x0c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git