diff --git a/recipes-extended/xen/files/0001-arm32-Avoid-using-solaris-syntax-for-.section-direct.patch b/recipes-extended/xen/files/0001-arm32-Avoid-using-solaris-syntax-for-.section-direct.patch deleted file mode 100644 index a4038dda..00000000 --- a/recipes-extended/xen/files/0001-arm32-Avoid-using-solaris-syntax-for-.section-direct.patch +++ /dev/null @@ -1,70 +0,0 @@ -From dfc490a3740bb7d6889939934afadcb58891fbce Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 1 Aug 2023 10:49:30 -0700 -Subject: [PATCH] arm: Avoid using solaris syntax for .section directive - -Assembler from binutils 2.41 will rejects ([1], [2]) the following -syntax - -.section "name", #alloc - -for any other any target other than ELF SPARC. This means we can't use -it in the Arm code. - -So switch to the GNU syntax - -.section name [, "flags"[, @type]] - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=11601 -[2] https://sourceware.org/binutils/docs-2.41/as.html#Section - -Upstream-Status: Backport [https://github.com/xen-project/xen/commit/dfc490a3740bb7d6889939934afadcb58891fbce] -Signed-off-by: Khem Raj -Reviewed-by: Michal Orzel -[jgrall: Reword commit message] -Acked-by: Julien Grall ---- - xen/arch/arm/arm32/proc-v7.S | 6 +++--- - xen/arch/arm/dtb.S | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S -index c90a31d80fc5..6d3d19b87354 100644 ---- a/xen/arch/arm/arm32/proc-v7.S -+++ b/xen/arch/arm/arm32/proc-v7.S -@@ -29,7 +29,7 @@ brahma15mp_init: - mcr CP32(r0, ACTLR) - mov pc, lr - -- .section ".proc.info", #alloc -+ .section .proc.info, "a" - .type __v7_ca15mp_proc_info, #object - __v7_ca15mp_proc_info: - .long 0x410FC0F0 /* Cortex-A15 */ -@@ -38,7 +38,7 @@ __v7_ca15mp_proc_info: - .long caxx_processor - .size __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info - -- .section ".proc.info", #alloc -+ .section .proc.info, "a" - .type __v7_ca7mp_proc_info, #object - __v7_ca7mp_proc_info: - .long 0x410FC070 /* Cortex-A7 */ -@@ -47,7 +47,7 @@ __v7_ca7mp_proc_info: - .long caxx_processor - .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info - -- .section ".proc.info", #alloc -+ .section .proc.info, "a" - .type __v7_brahma15mp_proc_info, #object - __v7_brahma15mp_proc_info: - .long 0x420F00F0 /* Broadcom Brahma-B15 */ -diff --git a/xen/arch/arm/dtb.S b/xen/arch/arm/dtb.S -index c39f3a095c58..386f83ba649e 100644 ---- a/xen/arch/arm/dtb.S -+++ b/xen/arch/arm/dtb.S -@@ -1,3 +1,3 @@ -- .section .dtb,#alloc -+ .section .dtb, "a" - GLOBAL(_sdtb) - .incbin CONFIG_DTB_FILE diff --git a/recipes-extended/xen/xen-tools_4.17.bb b/recipes-extended/xen/xen-tools_4.17.bb index 83093425..c6a3052c 100644 --- a/recipes-extended/xen/xen-tools_4.17.bb +++ b/recipes-extended/xen/xen-tools_4.17.bb @@ -1,5 +1,5 @@ -# stable-4.17 status on 5/26/2023 -SRCREV ?= "47eb94123035a2987dd1e328e9adec6db36e7fb3" +# xen 4.17.2 release sha +SRCREV ?= "322a20add00a4687cd46d9183616fa6fecbef81f" XEN_REL ?= "4.17" XEN_BRANCH ?= "stable-${XEN_REL}" diff --git a/recipes-extended/xen/xen_4.17.bb b/recipes-extended/xen/xen_4.17.bb index 54da7baf..8fae2c37 100644 --- a/recipes-extended/xen/xen_4.17.bb +++ b/recipes-extended/xen/xen_4.17.bb @@ -1,5 +1,5 @@ -# stable-4.17 status on 5/26/2023 -SRCREV ?= "47eb94123035a2987dd1e328e9adec6db36e7fb3" +# xen 4.17.2 release sha +SRCREV ?= "322a20add00a4687cd46d9183616fa6fecbef81f" XEN_REL ?= "4.17" XEN_BRANCH ?= "stable-${XEN_REL}" @@ -7,7 +7,6 @@ XEN_BRANCH ?= "stable-${XEN_REL}" SRC_URI = " \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \ - file://0001-arm32-Avoid-using-solaris-syntax-for-.section-direct.patch \ " LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"