From 125b3870f20a425855dcb82352984c957bd16e0a Mon Sep 17 00:00:00 2001 From: Chee Yang Lee Date: Tue, 11 Aug 2020 16:21:22 +0800 Subject: [PATCH] acrn: update to 2.1 Signed-off-by: Chee Yang Lee --- recipes-core/acrn/acrn-common.inc | 7 ++-- ...disable-array-bounds-warning-for-now.patch | 34 ------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 recipes-core/acrn/files/gcc-10-disable-array-bounds-warning-for-now.patch diff --git a/recipes-core/acrn/acrn-common.inc b/recipes-core/acrn/acrn-common.inc index d4dae222..26841d45 100644 --- a/recipes-core/acrn/acrn-common.inc +++ b/recipes-core/acrn/acrn-common.inc @@ -4,14 +4,13 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5732af37bf18525ed9d2b16985054901" SRC_URI = "git://github.com/projectacrn/acrn-hypervisor.git;branch=${SRCBRANCH} \ - file://gcc-10-disable-array-bounds-warning-for-now.patch \ " # Snapshot tags are of the format: # acrn-w.- -PV = "2.0" -SRCREV = "9c1f1a0dba6e59e4be9e2f5b70a06cf89c577ecb" -SRCBRANCH = "release_2.0" +PV = "2.1" +SRCREV = "70e70fa3167888a5d95c235354462f23aa748c7e" +SRCBRANCH = "release_2.1" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P\d+(\.\d+)+)$" diff --git a/recipes-core/acrn/files/gcc-10-disable-array-bounds-warning-for-now.patch b/recipes-core/acrn/files/gcc-10-disable-array-bounds-warning-for-now.patch deleted file mode 100644 index 7477823a..00000000 --- a/recipes-core/acrn/files/gcc-10-disable-array-bounds-warning-for-now.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5e864385d4a5e8816eaaa43c35935c5dbc72125e Mon Sep 17 00:00:00 2001 -From: Naveen Saini -Date: Fri, 15 May 2020 18:18:44 +0800 -Subject: [PATCH] gcc-10: disable 'array-bounds' warning for now - -Build failure log: -arch/x86/page.c: In function 'init_ept_mem_ops': -arch/x86/page.c:240:48: error: array subscript is outside array bounds of 'struct page[0][1]' [-Werror=array-bounds] -240 | ept_pages_info[vm_id].ept.nworld_pml4_base = pre_uos_nworld_pml4_pages[vm_id]; - -Suppress the warning until fix is not available in upstream. - -Upstream-Status: Pending - -Signed-off-by: Naveen Saini ---- - hypervisor/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hypervisor/Makefile b/hypervisor/Makefile -index 45a45c9e..4b9a22ae 100644 ---- a/hypervisor/Makefile -+++ b/hypervisor/Makefile -@@ -79,6 +79,7 @@ CFLAGS += -m64 -mno-mmx -mno-sse -mno-sse2 -mno-80387 -mno-fp-ret-in-387 - CFLAGS += -mno-red-zone -mpopcnt - CFLAGS += -nostdinc -nostdlib -fno-common - CFLAGS += -Werror -+CFLAGS += -Wno-array-bounds - CFLAGS += -O2 - ifeq (y, $(CONFIG_RELOC)) - CFLAGS += -fpie --- -2.17.1 -