Skip to content

Commit d4d4cae

Browse files
nickdesaulniersshr-project
authored andcommitted
ARM: 8933/1: replace Sun/Solaris style flag on section directive
[ Upstream commit 790756c ] It looks like a section directive was using "Solaris style" to declare the section flags. Replace this with the GNU style so that Clang's integrated assembler can assemble this directive. The modified instances were identified via: $ ag \.section | grep # Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119 Link: ClangBuiltLinux#744 Link: https://bugs.llvm.org/show_bug.cgi?id=43759 Link: https://reviews.llvm.org/D69296 MJ: Cherry-pick to 3.4 had many conflicts because 3.4 is missing: commit bf35706 Author: Ard Biesheuvel <[email protected]> Date: Wed Mar 18 07:29:32 2015 +0100 ARM: 8314/1: replace PROCINFO embedded branch with relative offset which replaced most of these .section .start,#alloc, #execinstr with just: .section .start,#alloc Acked-by: Nicolas Pitre <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]> Reviewed-by: Stefan Agner <[email protected]> Signed-off-by: Nick Desaulniers <[email protected]> Suggested-by: Fangrui Song <[email protected]> Suggested-by: Jian Cai <[email protected]> Suggested-by: Peter Smith <[email protected]> Signed-off-by: Russell King <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Martin Jansa <[email protected]>
1 parent 57a74cc commit d4d4cae

32 files changed

+32
-32
lines changed

arch/arm/boot/bootp/init.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* size immediately following the kernel, we could build this into
1717
* a binary blob, and concatenate the zImage using the cat command.
1818
*/
19-
.section .start,#alloc,#execinstr
19+
.section .start, "ax"
2020
.type _start, #function
2121
.globl _start
2222

arch/arm/boot/compressed/big-endian.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Author: Nicolas Pitre
66
*/
77

8-
.section ".start", #alloc, #execinstr
8+
.section ".start", "ax"
99

1010
mrc p15, 0, r0, c1, c0, 0 @ read control reg
1111
orr r0, r0, #(1 << 7) @ enable big endian mode

arch/arm/boot/compressed/head.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
#endif
114114
.endm
115115

116-
.section ".start", #alloc, #execinstr
116+
.section ".start", "ax"
117117
/*
118118
* sort out different calling conventions
119119
*/

arch/arm/boot/compressed/piggy.gzip.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.section .piggydata,#alloc
1+
.section .piggydata, "a"
22
.globl input_data
33
input_data:
44
.incbin "arch/arm/boot/compressed/piggy.gzip"

arch/arm/boot/compressed/piggy.lz4.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.section .piggydata,#alloc
1+
.section .piggydata, "a"
22
.globl input_data
33
input_data:
44
.incbin "arch/arm/boot/compressed/piggy.lz4"

arch/arm/boot/compressed/piggy.lzma.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.section .piggydata,#alloc
1+
.section .piggydata, "a"
22
.globl input_data
33
input_data:
44
.incbin "arch/arm/boot/compressed/piggy.lzma"

arch/arm/boot/compressed/piggy.lzo.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.section .piggydata,#alloc
1+
.section .piggydata, "a"
22
.globl input_data
33
input_data:
44
.incbin "arch/arm/boot/compressed/piggy.lzo"

arch/arm/boot/compressed/piggy.xzkern.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.section .piggydata,#alloc
1+
.section .piggydata, "a"
22
.globl input_data
33
input_data:
44
.incbin "arch/arm/boot/compressed/piggy.xzkern"

arch/arm/mm/proc-arm1020.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ cpu_arm1020_name:
505505

506506
.align
507507

508-
.section ".proc.info.init", #alloc, #execinstr
508+
.section ".proc.info.init", "ax"
509509

510510
.type __arm1020_proc_info,#object
511511
__arm1020_proc_info:

arch/arm/mm/proc-arm1020e.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ arm1020e_crval:
463463

464464
.align
465465

466-
.section ".proc.info.init", #alloc, #execinstr
466+
.section ".proc.info.init", "ax"
467467

468468
.type __arm1020e_proc_info,#object
469469
__arm1020e_proc_info:

0 commit comments

Comments
 (0)