From 900c85076e8a438659132846db1734b094ec56a4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2023 17:34:06 -0700 Subject: xen: Fix build with gas/2.41 Signed-off-by: Khem Raj Cc: Alexandre Belloni Signed-off-by: Bruce Ashfield --- ...-using-solaris-syntax-for-.section-direct.patch | 62 ++++++++++++++++++++++ recipes-extended/xen/xen_4.17.bb | 4 ++ 2 files changed, 66 insertions(+) create mode 100644 recipes-extended/xen/files/0001-arm32-Avoid-using-solaris-syntax-for-.section-direct.patch 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 new file mode 100644 index 00000000..c73bb270 --- /dev/null +++ b/recipes-extended/xen/files/0001-arm32-Avoid-using-solaris-syntax-for-.section-direct.patch @@ -0,0 +1,62 @@ +From 9add6f9aced42a76f6a2c124754bef6fde56fa05 Mon Sep 17 00:00:00 2001 +From: Khem Raj +To: xen-devel@lists.xenproject.org +Cc: Stefano Stabellini +Cc: Julien Grall +Cc: Bertrand Marquis +Cc: Volodymyr Babchuk +Date: Mon, 31 Jul 2023 17:01:32 -0700 +Subject: [PATCH] arm32: Avoid using solaris syntax for .section directive + +Assembler from binutils 2.41 rejects this syntax + +.section "name"[, flags...] + +where flags could be #alloc, #write, #execstr +Switch to using ELF syntax + +.section name[, "flags"[, @type]] + +[1] https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119 + +Upstream-Status: Submitted [by email to xen-devel@lists.xenproject.org and maintainers] + +Signed-off-by: Khem Raj +--- + xen/arch/arm/arm32/proc-v7.S | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S +index c90a31d80f..6d3d19b873 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 */ +-- +2.41.0 + diff --git a/recipes-extended/xen/xen_4.17.bb b/recipes-extended/xen/xen_4.17.bb index 9da1b194..bd8f55b3 100644 --- a/recipes-extended/xen/xen_4.17.bb +++ b/recipes-extended/xen/xen_4.17.bb @@ -7,6 +7,7 @@ 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" @@ -17,3 +18,6 @@ S = "${WORKDIR}/git" require xen.inc require xen-hypervisor.inc + +TOOLCHAIN = "gcc" +LDFLAGS:remove = "-fuse-ld=lld" -- cgit v1.2.3-54-g00ecf