[Pkg-xen-changes] [xen] 04/04: merge patched-feature/reportbug into feature/reportbug

[Ian James Campbell]

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

ijc pushed a commit to branch feature/reportbug
in repository xen.

commit fa05482b9559792ed384f823f7e12542c38547e4
Merge: fb56ab4 11470f2
Author: Ian Campbell <ijc at debian.org>
Date:   Fri Aug 21 15:49:33 2015 +0100

    merge patched-feature/reportbug into feature/reportbug

 debian/.git-dpm                                    |  4 +--
 ...on-Use-unbounded-array-for-symbols_offset.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 xen/common/symbols.c                               |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 31d675f,0000000..558df9d
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
- d54d80e8d4668b6f7a0c161f6868eab43c0a0d9b
- d54d80e8d4668b6f7a0c161f6868eab43c0a0d9b
++11470f22cce35724fc26dcce9cb5ba4710365c9d
++11470f22cce35724fc26dcce9cb5ba4710365c9d
 +9245d82e421a7ce0f7387b7c1b8185088769ddb3
 +9245d82e421a7ce0f7387b7c1b8185088769ddb3
 +xen_4.5.1~rc1.orig.tar.xz
 +5ce257effdc1f929d2e024b1a8199be52aa56d88
 +3485596
diff --cc debian/patches/0028-xen-common-Use-unbounded-array-for-symbols_offset.patch
index 0000000,0000000..7b43225
new file mode 100644
--- /dev/null
+++ b/debian/patches/0028-xen-common-Use-unbounded-array-for-symbols_offset.patch
@@@ -1,0 -1,0 +1,29 @@@
++From 11470f22cce35724fc26dcce9cb5ba4710365c9d Mon Sep 17 00:00:00 2001
++From: Ian Campbell <ian.campbell at citrix.com>
++Date: Fri, 13 Mar 2015 12:22:25 +0000
++Subject: xen: common: Use unbounded array for symbols_offset.
++
++Using a singleton array causes gcc5 to report:
++symbols.c: In function 'symbols_lookup':
++symbols.c:128:359: error: array subscript is above array bounds [-Werror=array-bounds]
++symbols.c:136:176: error: array subscript is above array bounds [-Werror=array-bounds]
++
++Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
++Acked-by: Jan Beulich <jbeulich at suse.com>
++---
++ xen/common/symbols.c | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/xen/common/symbols.c b/xen/common/symbols.c
++index bc2fde6..fc7c9e7 100644
++--- a/xen/common/symbols.c
+++++ b/xen/common/symbols.c
++@@ -19,7 +19,7 @@
++ #include <xen/spinlock.h>
++ 
++ #ifdef SYMBOLS_ORIGIN
++-extern const unsigned int symbols_offsets[1];
+++extern const unsigned int symbols_offsets[];
++ #define symbols_address(n) (SYMBOLS_ORIGIN + symbols_offsets[n])
++ #else
++ extern const unsigned long symbols_addresses[];
diff --cc debian/patches/series
index 85657a5,0000000..432a8ca
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,27 -1,0 +1,28 @@@
 +version.diff
 +config-prefix.diff
 +tools-libfsimage-abiname.diff
 +tools-libxc-abiname.diff
 +tools-libxl-abiname.diff
 +tools-xenstat-abiname.diff
 +tools-rpath.diff
 +tools-blktap2-prefix.diff
 +tools-console-prefix.diff
 +tools-libfsimage-prefix.diff
 +tools-libxl-prefix.diff
 +tools-misc-prefix.diff
 +tools-pygrub-prefix.diff
 +tools-python-prefix.diff
 +tools-xcutils-rpath.diff
 +tools-xenmon-prefix.diff
 +tools-xenpaging-prefix.diff
 +tools-xenpmd-prefix.diff
 +tools-xenstat-prefix.diff
 +tools-xenstore-prefix.diff
 +tools-xentrace-prefix.diff
 +tools-pygrub-remove-static-solaris-support
 +tools-include-install.diff
 +tools-xenmon-install.diff
 +tools-hotplug-udevrules.diff
 +tools-xenstore-compatibility.diff
 +xl-coredumps-to-var-lib-xen-dump.diff
++0028-xen-common-Use-unbounded-array-for-symbols_offset.patch

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