1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
From dfc490a3740bb7d6889939934afadcb58891fbce Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
Reviewed-by: Michal Orzel <michal.orzel@amd.com>
[jgrall: Reword commit message]
Acked-by: Julien Grall <jgrall@amazon.com>
---
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
|