Skip to content

Commit

Permalink
ARM: 8933/1: replace Sun/Solaris style flag on section directive
Browse files Browse the repository at this point in the history
[ 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/linux#744
Link: https://bugs.llvm.org/show_bug.cgi?id=43759
Link: https://reviews.llvm.org/D69296

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]>
  • Loading branch information
nickdesaulniers authored and gregkh committed Nov 8, 2023
1 parent 13ab990 commit 3ab03df
Show file tree
Hide file tree
Showing 28 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/bootp/init.S
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* size immediately following the kernel, we could build this into
* a binary blob, and concatenate the zImage using the cat command.
*/
.section .start,#alloc,#execinstr
.section .start, "ax"
.type _start, #function
.globl _start

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/compressed/big-endian.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Author: Nicolas Pitre
*/

.section ".start", #alloc, #execinstr
.section ".start", "ax"

mrc p15, 0, r0, c1, c0, 0 @ read control reg
orr r0, r0, #(1 << 7) @ enable big endian mode
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/compressed/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
#endif
.endm

.section ".start", #alloc, #execinstr
.section ".start", "ax"
/*
* sort out different calling conventions
*/
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/compressed/piggy.S
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
.section .piggydata,#alloc
.section .piggydata, "a"
.globl input_data
input_data:
.incbin "arch/arm/boot/compressed/piggy_data"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm1020.S
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ cpu_arm1020_name:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __arm1020_proc_info,#object
__arm1020_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm1020e.S
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ arm1020e_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __arm1020e_proc_info,#object
__arm1020e_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm1022.S
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ arm1022_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __arm1022_proc_info,#object
__arm1022_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm1026.S
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ arm1026_crval:
string cpu_arm1026_name, "ARM1026EJ-S"
.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __arm1026_proc_info,#object
__arm1026_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm720.S
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ arm720_crval:
* See <asm/procinfo.h> for a definition of this structure.
*/

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.macro arm720_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cpu_flush:req
.type __\name\()_proc_info,#object
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm740.S
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ __arm740_setup:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"
.type __arm740_proc_info,#object
__arm740_proc_info:
.long 0x41807400
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm7tdmi.S
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ __arm7tdmi_setup:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.macro arm7tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, \
extra_hwcaps=0
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm920.S
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ arm920_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __arm920_proc_info,#object
__arm920_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm922.S
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ arm922_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __arm922_proc_info,#object
__arm922_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm925.S
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ arm925_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.macro arm925_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache
.type __\name\()_proc_info,#object
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm926.S
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ arm926_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __arm926_proc_info,#object
__arm926_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm940.S
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ __arm940_setup:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __arm940_proc_info,#object
__arm940_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm946.S
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ __arm946_setup:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"
.type __arm946_proc_info,#object
__arm946_proc_info:
.long 0x41009460
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-arm9tdmi.S
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ __arm9tdmi_setup:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.macro arm9tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req
.type __\name\()_proc_info, #object
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-fa526.S
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ fa526_cr1_set:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __fa526_proc_info,#object
__fa526_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-feroceon.S
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ feroceon_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.macro feroceon_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache:req
.type __\name\()_proc_info,#object
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-mohawk.S
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ mohawk_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __88sv331x_proc_info,#object
__88sv331x_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-sa110.S
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ sa110_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.type __sa110_proc_info,#object
__sa110_proc_info:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-sa1100.S
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ sa1100_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.macro sa1100_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req
.type __\name\()_proc_info,#object
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-v6.S
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ v6_crval:
string cpu_elf_name, "v6"
.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

/*
* Match any ARMv6 processor core.
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-v7.S
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ __v7_setup_stack:
string cpu_elf_name, "v7"
.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

/*
* Standard v7 proc info content
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mm/proc-v7m.S
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ ENTRY(cpu_cm7_proc_fin)
ret lr
ENDPROC(cpu_cm7_proc_fin)

.section ".init.text", #alloc, #execinstr
.section ".init.text", "ax"

__v7m_cm7_setup:
mov r8, #(V7M_SCB_CCR_DC | V7M_SCB_CCR_IC| V7M_SCB_CCR_BP)
Expand Down Expand Up @@ -181,7 +181,7 @@ ENDPROC(__v7m_setup)
string cpu_elf_name "v7m"
string cpu_v7m_name "ARMv7-M"

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.macro __v7m_proc name, initfunc, cache_fns = nop_cache_fns, hwcaps = 0, proc_fns = v7m_processor_functions
.long 0 /* proc_info_list.__cpu_mm_mmu_flags */
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-xsc3.S
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ xsc3_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.macro xsc3_proc_info name:req, cpu_val:req, cpu_mask:req
.type __\name\()_proc_info,#object
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-xscale.S
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ xscale_crval:

.align

.section ".proc.info.init", #alloc
.section ".proc.info.init", "a"

.macro xscale_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache
.type __\name\()_proc_info,#object
Expand Down

0 comments on commit 3ab03df

Please sign in to comment.