123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432 |
- From 790756c7e0229dedc83bf058ac69633045b1000e Mon Sep 17 00:00:00 2001
- From: Nick Desaulniers <ndesaulniers@google.com>
- Date: Mon, 4 Nov 2019 19:31:45 +0100
- Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
- directive
- 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: https://github.com/ClangBuiltLinux/linux/issues/744
- Link: https://bugs.llvm.org/show_bug.cgi?id=43759
- Link: https://reviews.llvm.org/D69296
- Acked-by: Nicolas Pitre <nico@fluxnic.net>
- Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
- Reviewed-by: Stefan Agner <stefan@agner.ch>
- Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
- Suggested-by: Fangrui Song <maskray@google.com>
- Suggested-by: Jian Cai <jiancai@google.com>
- Suggested-by: Peter Smith <peter.smith@linaro.org>
- Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
- Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=762d2dcd9e233e3025f8627ea65f23e568045edb
- ---
- arch/arm/boot/bootp/init.S | 2 +-
- arch/arm/boot/compressed/big-endian.S | 2 +-
- arch/arm/boot/compressed/head.S | 2 +-
- arch/arm/boot/compressed/piggy.S | 2 +-
- arch/arm/mm/proc-arm1020.S | 2 +-
- arch/arm/mm/proc-arm1020e.S | 2 +-
- arch/arm/mm/proc-arm1022.S | 2 +-
- arch/arm/mm/proc-arm1026.S | 2 +-
- arch/arm/mm/proc-arm720.S | 2 +-
- arch/arm/mm/proc-arm740.S | 2 +-
- arch/arm/mm/proc-arm7tdmi.S | 2 +-
- arch/arm/mm/proc-arm920.S | 2 +-
- arch/arm/mm/proc-arm922.S | 2 +-
- arch/arm/mm/proc-arm925.S | 2 +-
- arch/arm/mm/proc-arm926.S | 2 +-
- arch/arm/mm/proc-arm940.S | 2 +-
- arch/arm/mm/proc-arm946.S | 2 +-
- arch/arm/mm/proc-arm9tdmi.S | 2 +-
- arch/arm/mm/proc-fa526.S | 2 +-
- arch/arm/mm/proc-feroceon.S | 2 +-
- arch/arm/mm/proc-mohawk.S | 2 +-
- arch/arm/mm/proc-sa110.S | 2 +-
- arch/arm/mm/proc-sa1100.S | 2 +-
- arch/arm/mm/proc-v6.S | 2 +-
- arch/arm/mm/proc-v7.S | 2 +-
- arch/arm/mm/proc-v7m.S | 4 ++--
- arch/arm/mm/proc-xsc3.S | 2 +-
- arch/arm/mm/proc-xscale.S | 2 +-
- 28 files changed, 29 insertions(+), 29 deletions(-)
- diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
- index 5c476bd2b4ce..b562da2f7040 100644
- --- a/arch/arm/boot/bootp/init.S
- +++ b/arch/arm/boot/bootp/init.S
- @@ -13,7 +13,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
-
- diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
- index 88e2a88d324b..0e092c36da2f 100644
- --- a/arch/arm/boot/compressed/big-endian.S
- +++ b/arch/arm/boot/compressed/big-endian.S
- @@ -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
- diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
- index ae70754d003d..ead21e5f2b80 100644
- --- a/arch/arm/boot/compressed/head.S
- +++ b/arch/arm/boot/compressed/head.S
- @@ -140,7 +140,7 @@
- #endif
- .endm
-
- - .section ".start", #alloc, #execinstr
- + .section ".start", "ax"
- /*
- * sort out different calling conventions
- */
- diff --git a/arch/arm/boot/compressed/piggy.S b/arch/arm/boot/compressed/piggy.S
- index 0284f84dcf38..27577644ee72 100644
- --- a/arch/arm/boot/compressed/piggy.S
- +++ b/arch/arm/boot/compressed/piggy.S
- @@ -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"
- diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
- index 4fa5371bc662..2785da387c91 100644
- --- a/arch/arm/mm/proc-arm1020.S
- +++ b/arch/arm/mm/proc-arm1020.S
- @@ -491,7 +491,7 @@ cpu_arm1020_name:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- .type __arm1020_proc_info,#object
- __arm1020_proc_info:
- diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
- index 5d8a8339e09a..e9ea237ed785 100644
- --- a/arch/arm/mm/proc-arm1020e.S
- +++ b/arch/arm/mm/proc-arm1020e.S
- @@ -449,7 +449,7 @@ arm1020e_crval:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- .type __arm1020e_proc_info,#object
- __arm1020e_proc_info:
- diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
- index b3dd95c345e4..920c279e7879 100644
- --- a/arch/arm/mm/proc-arm1022.S
- +++ b/arch/arm/mm/proc-arm1022.S
- @@ -443,7 +443,7 @@ arm1022_crval:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- .type __arm1022_proc_info,#object
- __arm1022_proc_info:
- diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
- index e927187157d7..0bdf25a95b10 100644
- --- a/arch/arm/mm/proc-arm1026.S
- +++ b/arch/arm/mm/proc-arm1026.S
- @@ -437,7 +437,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:
- diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
- index c99d24363f32..39361e196d61 100644
- --- a/arch/arm/mm/proc-arm720.S
- +++ b/arch/arm/mm/proc-arm720.S
- @@ -172,7 +172,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
- diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
- index 1b4a3838393f..1a94bbf6e53f 100644
- --- a/arch/arm/mm/proc-arm740.S
- +++ b/arch/arm/mm/proc-arm740.S
- @@ -128,7 +128,7 @@ __arm740_setup:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
- .type __arm740_proc_info,#object
- __arm740_proc_info:
- .long 0x41807400
- diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
- index 17a4687065c7..52b66cf0259e 100644
- --- a/arch/arm/mm/proc-arm7tdmi.S
- +++ b/arch/arm/mm/proc-arm7tdmi.S
- @@ -72,7 +72,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
- diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
- index 298c76b47749..31ac8acc34dc 100644
- --- a/arch/arm/mm/proc-arm920.S
- +++ b/arch/arm/mm/proc-arm920.S
- @@ -434,7 +434,7 @@ arm920_crval:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- .type __arm920_proc_info,#object
- __arm920_proc_info:
- diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
- index 824be3a0bc23..ca2c7ca8af21 100644
- --- a/arch/arm/mm/proc-arm922.S
- +++ b/arch/arm/mm/proc-arm922.S
- @@ -412,7 +412,7 @@ arm922_crval:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- .type __arm922_proc_info,#object
- __arm922_proc_info:
- diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
- index d40cff8f102c..a381a0c9f109 100644
- --- a/arch/arm/mm/proc-arm925.S
- +++ b/arch/arm/mm/proc-arm925.S
- @@ -477,7 +477,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
- diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
- index 4ef89e1d1127..1ba253c2bce1 100644
- --- a/arch/arm/mm/proc-arm926.S
- +++ b/arch/arm/mm/proc-arm926.S
- @@ -460,7 +460,7 @@ arm926_crval:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- .type __arm926_proc_info,#object
- __arm926_proc_info:
- diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
- index 1c26d991386d..4b8a00220cc9 100644
- --- a/arch/arm/mm/proc-arm940.S
- +++ b/arch/arm/mm/proc-arm940.S
- @@ -340,7 +340,7 @@ __arm940_setup:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- .type __arm940_proc_info,#object
- __arm940_proc_info:
- diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
- index 2dc1c75a4fd4..555becf9c758 100644
- --- a/arch/arm/mm/proc-arm946.S
- +++ b/arch/arm/mm/proc-arm946.S
- @@ -395,7 +395,7 @@ __arm946_setup:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
- .type __arm946_proc_info,#object
- __arm946_proc_info:
- .long 0x41009460
- diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
- index 913c06e590af..ef517530130b 100644
- --- a/arch/arm/mm/proc-arm9tdmi.S
- +++ b/arch/arm/mm/proc-arm9tdmi.S
- @@ -66,7 +66,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
- diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S
- index 8120b6f4dbb8..dddf833fe000 100644
- --- a/arch/arm/mm/proc-fa526.S
- +++ b/arch/arm/mm/proc-fa526.S
- @@ -185,7 +185,7 @@ fa526_cr1_set:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- .type __fa526_proc_info,#object
- __fa526_proc_info:
- diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
- index bb6dc34d42a3..b12b76bc8d30 100644
- --- a/arch/arm/mm/proc-feroceon.S
- +++ b/arch/arm/mm/proc-feroceon.S
- @@ -571,7 +571,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
- diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
- index f08308578885..d47d6c5cee63 100644
- --- a/arch/arm/mm/proc-mohawk.S
- +++ b/arch/arm/mm/proc-mohawk.S
- @@ -416,7 +416,7 @@ mohawk_crval:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- .type __88sv331x_proc_info,#object
- __88sv331x_proc_info:
- diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
- index d5bc5d702563..baba503ba816 100644
- --- a/arch/arm/mm/proc-sa110.S
- +++ b/arch/arm/mm/proc-sa110.S
- @@ -196,7 +196,7 @@ sa110_crval:
-
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- .type __sa110_proc_info,#object
- __sa110_proc_info:
- diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
- index be7b611c76c7..75ebacc8e4e5 100644
- --- a/arch/arm/mm/proc-sa1100.S
- +++ b/arch/arm/mm/proc-sa1100.S
- @@ -239,7 +239,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
- diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
- index c1c85eb3484f..1dd0d5ca27da 100644
- --- a/arch/arm/mm/proc-v6.S
- +++ b/arch/arm/mm/proc-v6.S
- @@ -261,7 +261,7 @@ v6_crval:
- string cpu_elf_name, "v6"
- .align
-
- - .section ".proc.info.init", #alloc
- + .section ".proc.info.init", "a"
-
- /*
- * Match any ARMv6 processor core.
- diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
- index c4e8006a1a8c..48e0ef6f0dcc 100644
- --- a/arch/arm/mm/proc-v7.S
- +++ b/arch/arm/mm/proc-v7.S
- @@ -644,7 +644,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
- diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S
- index 1a49d503eafc..84459c1d31b8 100644
- --- a/arch/arm/mm/proc-v7m.S
- +++ b/arch/arm/mm/proc-v7m.S
- @@ -93,7 +93,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)
- @@ -177,7 +177,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 */
- diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
- index 1ac0fbbe9f12..42eaecc43cfe 100644
- --- a/arch/arm/mm/proc-xsc3.S
- +++ b/arch/arm/mm/proc-xsc3.S
- @@ -496,7 +496,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
- diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
- index bdb2b7749b03..18ac5a1f8922 100644
- --- a/arch/arm/mm/proc-xscale.S
- +++ b/arch/arm/mm/proc-xscale.S
- @@ -610,7 +610,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
- --
- 2.43.0
|