[Pkg-xen-changes] [xen] 07/07: merge patched-feature/arm into feature/arm

[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 ec962c4b061d38f1098a08e68e5211f559218b18
Merge: 3926d07 6286cdf
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Fri Jul 18 23:49:35 2014 +0100

    merge patched-feature/arm into feature/arm

 debian/.git-dpm                                    |  4 +--
 ...round-for-glibc-PSR_MODE_-namespace-polut.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 xen/include/public/arch-arm.h                      | 11 ++++++++
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 825e495,0000000..b955764
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 67c0cb5a0a066779caa8c56831ecc896cadbb7cd
- 67c0cb5a0a066779caa8c56831ecc896cadbb7cd
++6286cdf5095f107c6fa8ce9abca05431e63ff846
++6286cdf5095f107c6fa8ce9abca05431e63ff846
 +960b45d65509eb156ccdac8f50a31ffa28e963a1
 +960b45d65509eb156ccdac8f50a31ffa28e963a1
 +xen_4.4.0.orig.tar.xz
 +39aaa0627cd93920be8d12e4c63042c23d653c8c
 +3767352
diff --cc debian/patches/0040-arm64-workaround-for-glibc-PSR_MODE_-namespace-polut.patch
index 0000000,0000000..e0c5057
new file mode 100644
--- /dev/null
+++ b/debian/patches/0040-arm64-workaround-for-glibc-PSR_MODE_-namespace-polut.patch
@@@ -1,0 -1,0 +1,33 @@@
++From 6286cdf5095f107c6fa8ce9abca05431e63ff846 Mon Sep 17 00:00:00 2001
++From: Ian Campbell <ijc at hellion.org.uk>
++Date: Fri, 18 Jul 2014 14:19:42 +0100
++Subject: 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
diff --cc debian/patches/series
index 7485b58,0000000..cbd3dc8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,39 -1,0 +1,40 @@@
 +0001-version.patch
 +0002-config-prefix.diff.patch
 +0003-tools-libfsimage-abiname.diff.patch
 +0004-tools-libxc-abiname.diff.patch
 +0005-tools-libxl-abiname.diff.patch
 +0006-tools-xenstat-abiname.diff.patch
 +0007-tools-rpath.diff.patch
 +0008-tools-blktap2-prefix.diff.patch
 +0009-tools-console-prefix.diff.patch
 +0010-tools-libfsimage-prefix.diff.patch
 +0011-tools-libfsimage-rpath.diff.patch
 +0012-tools-libxl-prefix.diff.patch
 +0013-tools-misc-prefix.diff.patch
 +0014-tools-misc-rpath.diff.patch
 +0015-tools-pygrub-prefix.diff.patch
 +0016-tools-python-prefix.diff.patch
 +0017-tools-python-rpath.diff.patch
 +0018-tools-xcutils-rpath.diff.patch
 +0019-tools-xenmon-prefix.diff.patch
 +0020-tools-xenmon-rpath.diff.patch
 +0021-tools-xenpaging-prefix.diff.patch
 +0022-tools-xenstat-prefix.diff.patch
 +0023-tools-xenstat-rpath.diff.patch
 +0024-tools-xenstore-prefix.diff.patch
 +0025-tools-xenstore-rpath.diff.patch
 +0026-tools-xentrace-prefix.diff.patch
 +0027-tools-xentrace-rpath.diff.patch
 +0028-tools-python-xen-relative-path.diff.patch
 +0029-tools-misc-xend-startup.diff.patch
 +0030-tools-disable.diff.patch
 +0031-tools-examples-xend-disable-network.diff.patch
 +0032-tools-examples-xend-disable-relocation.diff.patch
 +0033-tools-pygrub-remove-static-solaris-support.patch
 +0034-tools-include-install.diff.patch
 +0035-tools-xenmon-install.diff.patch
 +0036-tools-hotplug-udevrules.diff.patch
 +0037-tools-python-shebang.diff.patch
 +0038-tools-ocaml-fix-build.diff.patch
 +0039-tools-xenstore-compatibility.diff.patch
++0040-arm64-workaround-for-glibc-PSR_MODE_-namespace-polut.patch

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