diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-08-08 10:25:53 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-08-12 03:15:19 +0000 |
commit | ed6bcd97fa8dc385283b2f2ed9d65dfa6c9da267 (patch) | |
tree | 9c103275d2b60f1194c0836f96b7877653d7246e /recipes-extended | |
parent | 56593e277a377157944a6676e57497066b770a35 (diff) | |
download | meta-virtualization-ed6bcd97fa8dc385283b2f2ed9d65dfa6c9da267.tar.gz |
xen: Update arm assembly patch to upstream accepted one
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended')
-rw-r--r-- | recipes-extended/xen/files/0001-arm32-Avoid-using-solaris-syntax-for-.section-direct.patch | 48 |
1 files changed, 28 insertions, 20 deletions
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 index c73bb270..a4038dda 100644 --- 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 | |||
@@ -1,33 +1,35 @@ | |||
1 | From 9add6f9aced42a76f6a2c124754bef6fde56fa05 Mon Sep 17 00:00:00 2001 | 1 | From dfc490a3740bb7d6889939934afadcb58891fbce Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | To: xen-devel@lists.xenproject.org | 3 | Date: Tue, 1 Aug 2023 10:49:30 -0700 |
4 | Cc: Stefano Stabellini <sstabellini@kernel.org> | 4 | Subject: [PATCH] arm: Avoid using solaris syntax for .section directive |
5 | Cc: Julien Grall <julien@xen.org> | ||
6 | Cc: Bertrand Marquis <bertrand.marquis@arm.com> | ||
7 | Cc: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com> | ||
8 | Date: Mon, 31 Jul 2023 17:01:32 -0700 | ||
9 | Subject: [PATCH] arm32: Avoid using solaris syntax for .section directive | ||
10 | 5 | ||
11 | Assembler from binutils 2.41 rejects this syntax | 6 | Assembler from binutils 2.41 will rejects ([1], [2]) the following |
7 | syntax | ||
12 | 8 | ||
13 | .section "name"[, flags...] | 9 | .section "name", #alloc |
14 | 10 | ||
15 | where flags could be #alloc, #write, #execstr | 11 | for any other any target other than ELF SPARC. This means we can't use |
16 | Switch to using ELF syntax | 12 | it in the Arm code. |
17 | 13 | ||
18 | .section name[, "flags"[, @type]] | 14 | So switch to the GNU syntax |
19 | 15 | ||
20 | [1] https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119 | 16 | .section name [, "flags"[, @type]] |
21 | 17 | ||
22 | Upstream-Status: Submitted [by email to xen-devel@lists.xenproject.org and maintainers] | 18 | [1] https://sourceware.org/bugzilla/show_bug.cgi?id=11601 |
19 | [2] https://sourceware.org/binutils/docs-2.41/as.html#Section | ||
23 | 20 | ||
21 | Upstream-Status: Backport [https://github.com/xen-project/xen/commit/dfc490a3740bb7d6889939934afadcb58891fbce] | ||
24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
23 | Reviewed-by: Michal Orzel <michal.orzel@amd.com> | ||
24 | [jgrall: Reword commit message] | ||
25 | Acked-by: Julien Grall <jgrall@amazon.com> | ||
25 | --- | 26 | --- |
26 | xen/arch/arm/arm32/proc-v7.S | 6 +++--- | 27 | xen/arch/arm/arm32/proc-v7.S | 6 +++--- |
27 | 1 file changed, 3 insertions(+), 3 deletions(-) | 28 | xen/arch/arm/dtb.S | 2 +- |
29 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
28 | 30 | ||
29 | diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S | 31 | diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S |
30 | index c90a31d80f..6d3d19b873 100644 | 32 | index c90a31d80fc5..6d3d19b87354 100644 |
31 | --- a/xen/arch/arm/arm32/proc-v7.S | 33 | --- a/xen/arch/arm/arm32/proc-v7.S |
32 | +++ b/xen/arch/arm/arm32/proc-v7.S | 34 | +++ b/xen/arch/arm/arm32/proc-v7.S |
33 | @@ -29,7 +29,7 @@ brahma15mp_init: | 35 | @@ -29,7 +29,7 @@ brahma15mp_init: |
@@ -57,6 +59,12 @@ index c90a31d80f..6d3d19b873 100644 | |||
57 | .type __v7_brahma15mp_proc_info, #object | 59 | .type __v7_brahma15mp_proc_info, #object |
58 | __v7_brahma15mp_proc_info: | 60 | __v7_brahma15mp_proc_info: |
59 | .long 0x420F00F0 /* Broadcom Brahma-B15 */ | 61 | .long 0x420F00F0 /* Broadcom Brahma-B15 */ |
60 | -- | 62 | diff --git a/xen/arch/arm/dtb.S b/xen/arch/arm/dtb.S |
61 | 2.41.0 | 63 | index c39f3a095c58..386f83ba649e 100644 |
62 | 64 | --- a/xen/arch/arm/dtb.S | |
65 | +++ b/xen/arch/arm/dtb.S | ||
66 | @@ -1,3 +1,3 @@ | ||
67 | - .section .dtb,#alloc | ||
68 | + .section .dtb, "a" | ||
69 | GLOBAL(_sdtb) | ||
70 | .incbin CONFIG_DTB_FILE | ||