0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch 13 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432
  1. From 790756c7e0229dedc83bf058ac69633045b1000e Mon Sep 17 00:00:00 2001
  2. From: Nick Desaulniers <ndesaulniers@google.com>
  3. Date: Mon, 4 Nov 2019 19:31:45 +0100
  4. Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
  5. directive
  6. It looks like a section directive was using "Solaris style" to declare
  7. the section flags. Replace this with the GNU style so that Clang's
  8. integrated assembler can assemble this directive.
  9. The modified instances were identified via:
  10. $ ag \.section | grep #
  11. Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119
  12. Link: https://github.com/ClangBuiltLinux/linux/issues/744
  13. Link: https://bugs.llvm.org/show_bug.cgi?id=43759
  14. Link: https://reviews.llvm.org/D69296
  15. Acked-by: Nicolas Pitre <nico@fluxnic.net>
  16. Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
  17. Reviewed-by: Stefan Agner <stefan@agner.ch>
  18. Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
  19. Suggested-by: Fangrui Song <maskray@google.com>
  20. Suggested-by: Jian Cai <jiancai@google.com>
  21. Suggested-by: Peter Smith <peter.smith@linaro.org>
  22. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  23. Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=762d2dcd9e233e3025f8627ea65f23e568045edb
  24. ---
  25. arch/arm/boot/bootp/init.S | 2 +-
  26. arch/arm/boot/compressed/big-endian.S | 2 +-
  27. arch/arm/boot/compressed/head.S | 2 +-
  28. arch/arm/boot/compressed/piggy.S | 2 +-
  29. arch/arm/mm/proc-arm1020.S | 2 +-
  30. arch/arm/mm/proc-arm1020e.S | 2 +-
  31. arch/arm/mm/proc-arm1022.S | 2 +-
  32. arch/arm/mm/proc-arm1026.S | 2 +-
  33. arch/arm/mm/proc-arm720.S | 2 +-
  34. arch/arm/mm/proc-arm740.S | 2 +-
  35. arch/arm/mm/proc-arm7tdmi.S | 2 +-
  36. arch/arm/mm/proc-arm920.S | 2 +-
  37. arch/arm/mm/proc-arm922.S | 2 +-
  38. arch/arm/mm/proc-arm925.S | 2 +-
  39. arch/arm/mm/proc-arm926.S | 2 +-
  40. arch/arm/mm/proc-arm940.S | 2 +-
  41. arch/arm/mm/proc-arm946.S | 2 +-
  42. arch/arm/mm/proc-arm9tdmi.S | 2 +-
  43. arch/arm/mm/proc-fa526.S | 2 +-
  44. arch/arm/mm/proc-feroceon.S | 2 +-
  45. arch/arm/mm/proc-mohawk.S | 2 +-
  46. arch/arm/mm/proc-sa110.S | 2 +-
  47. arch/arm/mm/proc-sa1100.S | 2 +-
  48. arch/arm/mm/proc-v6.S | 2 +-
  49. arch/arm/mm/proc-v7.S | 2 +-
  50. arch/arm/mm/proc-v7m.S | 4 ++--
  51. arch/arm/mm/proc-xsc3.S | 2 +-
  52. arch/arm/mm/proc-xscale.S | 2 +-
  53. 28 files changed, 29 insertions(+), 29 deletions(-)
  54. diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
  55. index 5c476bd2b4ce..b562da2f7040 100644
  56. --- a/arch/arm/boot/bootp/init.S
  57. +++ b/arch/arm/boot/bootp/init.S
  58. @@ -13,7 +13,7 @@
  59. * size immediately following the kernel, we could build this into
  60. * a binary blob, and concatenate the zImage using the cat command.
  61. */
  62. - .section .start,#alloc,#execinstr
  63. + .section .start, "ax"
  64. .type _start, #function
  65. .globl _start
  66. diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
  67. index 88e2a88d324b..0e092c36da2f 100644
  68. --- a/arch/arm/boot/compressed/big-endian.S
  69. +++ b/arch/arm/boot/compressed/big-endian.S
  70. @@ -6,7 +6,7 @@
  71. * Author: Nicolas Pitre
  72. */
  73. - .section ".start", #alloc, #execinstr
  74. + .section ".start", "ax"
  75. mrc p15, 0, r0, c1, c0, 0 @ read control reg
  76. orr r0, r0, #(1 << 7) @ enable big endian mode
  77. diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
  78. index ae70754d003d..ead21e5f2b80 100644
  79. --- a/arch/arm/boot/compressed/head.S
  80. +++ b/arch/arm/boot/compressed/head.S
  81. @@ -140,7 +140,7 @@
  82. #endif
  83. .endm
  84. - .section ".start", #alloc, #execinstr
  85. + .section ".start", "ax"
  86. /*
  87. * sort out different calling conventions
  88. */
  89. diff --git a/arch/arm/boot/compressed/piggy.S b/arch/arm/boot/compressed/piggy.S
  90. index 0284f84dcf38..27577644ee72 100644
  91. --- a/arch/arm/boot/compressed/piggy.S
  92. +++ b/arch/arm/boot/compressed/piggy.S
  93. @@ -1,5 +1,5 @@
  94. /* SPDX-License-Identifier: GPL-2.0 */
  95. - .section .piggydata,#alloc
  96. + .section .piggydata, "a"
  97. .globl input_data
  98. input_data:
  99. .incbin "arch/arm/boot/compressed/piggy_data"
  100. diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
  101. index 4fa5371bc662..2785da387c91 100644
  102. --- a/arch/arm/mm/proc-arm1020.S
  103. +++ b/arch/arm/mm/proc-arm1020.S
  104. @@ -491,7 +491,7 @@ cpu_arm1020_name:
  105. .align
  106. - .section ".proc.info.init", #alloc
  107. + .section ".proc.info.init", "a"
  108. .type __arm1020_proc_info,#object
  109. __arm1020_proc_info:
  110. diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
  111. index 5d8a8339e09a..e9ea237ed785 100644
  112. --- a/arch/arm/mm/proc-arm1020e.S
  113. +++ b/arch/arm/mm/proc-arm1020e.S
  114. @@ -449,7 +449,7 @@ arm1020e_crval:
  115. .align
  116. - .section ".proc.info.init", #alloc
  117. + .section ".proc.info.init", "a"
  118. .type __arm1020e_proc_info,#object
  119. __arm1020e_proc_info:
  120. diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
  121. index b3dd95c345e4..920c279e7879 100644
  122. --- a/arch/arm/mm/proc-arm1022.S
  123. +++ b/arch/arm/mm/proc-arm1022.S
  124. @@ -443,7 +443,7 @@ arm1022_crval:
  125. .align
  126. - .section ".proc.info.init", #alloc
  127. + .section ".proc.info.init", "a"
  128. .type __arm1022_proc_info,#object
  129. __arm1022_proc_info:
  130. diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
  131. index e927187157d7..0bdf25a95b10 100644
  132. --- a/arch/arm/mm/proc-arm1026.S
  133. +++ b/arch/arm/mm/proc-arm1026.S
  134. @@ -437,7 +437,7 @@ arm1026_crval:
  135. string cpu_arm1026_name, "ARM1026EJ-S"
  136. .align
  137. - .section ".proc.info.init", #alloc
  138. + .section ".proc.info.init", "a"
  139. .type __arm1026_proc_info,#object
  140. __arm1026_proc_info:
  141. diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
  142. index c99d24363f32..39361e196d61 100644
  143. --- a/arch/arm/mm/proc-arm720.S
  144. +++ b/arch/arm/mm/proc-arm720.S
  145. @@ -172,7 +172,7 @@ arm720_crval:
  146. * See <asm/procinfo.h> for a definition of this structure.
  147. */
  148. - .section ".proc.info.init", #alloc
  149. + .section ".proc.info.init", "a"
  150. .macro arm720_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cpu_flush:req
  151. .type __\name\()_proc_info,#object
  152. diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
  153. index 1b4a3838393f..1a94bbf6e53f 100644
  154. --- a/arch/arm/mm/proc-arm740.S
  155. +++ b/arch/arm/mm/proc-arm740.S
  156. @@ -128,7 +128,7 @@ __arm740_setup:
  157. .align
  158. - .section ".proc.info.init", #alloc
  159. + .section ".proc.info.init", "a"
  160. .type __arm740_proc_info,#object
  161. __arm740_proc_info:
  162. .long 0x41807400
  163. diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
  164. index 17a4687065c7..52b66cf0259e 100644
  165. --- a/arch/arm/mm/proc-arm7tdmi.S
  166. +++ b/arch/arm/mm/proc-arm7tdmi.S
  167. @@ -72,7 +72,7 @@ __arm7tdmi_setup:
  168. .align
  169. - .section ".proc.info.init", #alloc
  170. + .section ".proc.info.init", "a"
  171. .macro arm7tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, \
  172. extra_hwcaps=0
  173. diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
  174. index 298c76b47749..31ac8acc34dc 100644
  175. --- a/arch/arm/mm/proc-arm920.S
  176. +++ b/arch/arm/mm/proc-arm920.S
  177. @@ -434,7 +434,7 @@ arm920_crval:
  178. .align
  179. - .section ".proc.info.init", #alloc
  180. + .section ".proc.info.init", "a"
  181. .type __arm920_proc_info,#object
  182. __arm920_proc_info:
  183. diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
  184. index 824be3a0bc23..ca2c7ca8af21 100644
  185. --- a/arch/arm/mm/proc-arm922.S
  186. +++ b/arch/arm/mm/proc-arm922.S
  187. @@ -412,7 +412,7 @@ arm922_crval:
  188. .align
  189. - .section ".proc.info.init", #alloc
  190. + .section ".proc.info.init", "a"
  191. .type __arm922_proc_info,#object
  192. __arm922_proc_info:
  193. diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
  194. index d40cff8f102c..a381a0c9f109 100644
  195. --- a/arch/arm/mm/proc-arm925.S
  196. +++ b/arch/arm/mm/proc-arm925.S
  197. @@ -477,7 +477,7 @@ arm925_crval:
  198. .align
  199. - .section ".proc.info.init", #alloc
  200. + .section ".proc.info.init", "a"
  201. .macro arm925_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache
  202. .type __\name\()_proc_info,#object
  203. diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
  204. index 4ef89e1d1127..1ba253c2bce1 100644
  205. --- a/arch/arm/mm/proc-arm926.S
  206. +++ b/arch/arm/mm/proc-arm926.S
  207. @@ -460,7 +460,7 @@ arm926_crval:
  208. .align
  209. - .section ".proc.info.init", #alloc
  210. + .section ".proc.info.init", "a"
  211. .type __arm926_proc_info,#object
  212. __arm926_proc_info:
  213. diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
  214. index 1c26d991386d..4b8a00220cc9 100644
  215. --- a/arch/arm/mm/proc-arm940.S
  216. +++ b/arch/arm/mm/proc-arm940.S
  217. @@ -340,7 +340,7 @@ __arm940_setup:
  218. .align
  219. - .section ".proc.info.init", #alloc
  220. + .section ".proc.info.init", "a"
  221. .type __arm940_proc_info,#object
  222. __arm940_proc_info:
  223. diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
  224. index 2dc1c75a4fd4..555becf9c758 100644
  225. --- a/arch/arm/mm/proc-arm946.S
  226. +++ b/arch/arm/mm/proc-arm946.S
  227. @@ -395,7 +395,7 @@ __arm946_setup:
  228. .align
  229. - .section ".proc.info.init", #alloc
  230. + .section ".proc.info.init", "a"
  231. .type __arm946_proc_info,#object
  232. __arm946_proc_info:
  233. .long 0x41009460
  234. diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
  235. index 913c06e590af..ef517530130b 100644
  236. --- a/arch/arm/mm/proc-arm9tdmi.S
  237. +++ b/arch/arm/mm/proc-arm9tdmi.S
  238. @@ -66,7 +66,7 @@ __arm9tdmi_setup:
  239. .align
  240. - .section ".proc.info.init", #alloc
  241. + .section ".proc.info.init", "a"
  242. .macro arm9tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req
  243. .type __\name\()_proc_info, #object
  244. diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S
  245. index 8120b6f4dbb8..dddf833fe000 100644
  246. --- a/arch/arm/mm/proc-fa526.S
  247. +++ b/arch/arm/mm/proc-fa526.S
  248. @@ -185,7 +185,7 @@ fa526_cr1_set:
  249. .align
  250. - .section ".proc.info.init", #alloc
  251. + .section ".proc.info.init", "a"
  252. .type __fa526_proc_info,#object
  253. __fa526_proc_info:
  254. diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
  255. index bb6dc34d42a3..b12b76bc8d30 100644
  256. --- a/arch/arm/mm/proc-feroceon.S
  257. +++ b/arch/arm/mm/proc-feroceon.S
  258. @@ -571,7 +571,7 @@ feroceon_crval:
  259. .align
  260. - .section ".proc.info.init", #alloc
  261. + .section ".proc.info.init", "a"
  262. .macro feroceon_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache:req
  263. .type __\name\()_proc_info,#object
  264. diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
  265. index f08308578885..d47d6c5cee63 100644
  266. --- a/arch/arm/mm/proc-mohawk.S
  267. +++ b/arch/arm/mm/proc-mohawk.S
  268. @@ -416,7 +416,7 @@ mohawk_crval:
  269. .align
  270. - .section ".proc.info.init", #alloc
  271. + .section ".proc.info.init", "a"
  272. .type __88sv331x_proc_info,#object
  273. __88sv331x_proc_info:
  274. diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
  275. index d5bc5d702563..baba503ba816 100644
  276. --- a/arch/arm/mm/proc-sa110.S
  277. +++ b/arch/arm/mm/proc-sa110.S
  278. @@ -196,7 +196,7 @@ sa110_crval:
  279. .align
  280. - .section ".proc.info.init", #alloc
  281. + .section ".proc.info.init", "a"
  282. .type __sa110_proc_info,#object
  283. __sa110_proc_info:
  284. diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
  285. index be7b611c76c7..75ebacc8e4e5 100644
  286. --- a/arch/arm/mm/proc-sa1100.S
  287. +++ b/arch/arm/mm/proc-sa1100.S
  288. @@ -239,7 +239,7 @@ sa1100_crval:
  289. .align
  290. - .section ".proc.info.init", #alloc
  291. + .section ".proc.info.init", "a"
  292. .macro sa1100_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req
  293. .type __\name\()_proc_info,#object
  294. diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
  295. index c1c85eb3484f..1dd0d5ca27da 100644
  296. --- a/arch/arm/mm/proc-v6.S
  297. +++ b/arch/arm/mm/proc-v6.S
  298. @@ -261,7 +261,7 @@ v6_crval:
  299. string cpu_elf_name, "v6"
  300. .align
  301. - .section ".proc.info.init", #alloc
  302. + .section ".proc.info.init", "a"
  303. /*
  304. * Match any ARMv6 processor core.
  305. diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
  306. index c4e8006a1a8c..48e0ef6f0dcc 100644
  307. --- a/arch/arm/mm/proc-v7.S
  308. +++ b/arch/arm/mm/proc-v7.S
  309. @@ -644,7 +644,7 @@ __v7_setup_stack:
  310. string cpu_elf_name, "v7"
  311. .align
  312. - .section ".proc.info.init", #alloc
  313. + .section ".proc.info.init", "a"
  314. /*
  315. * Standard v7 proc info content
  316. diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S
  317. index 1a49d503eafc..84459c1d31b8 100644
  318. --- a/arch/arm/mm/proc-v7m.S
  319. +++ b/arch/arm/mm/proc-v7m.S
  320. @@ -93,7 +93,7 @@ ENTRY(cpu_cm7_proc_fin)
  321. ret lr
  322. ENDPROC(cpu_cm7_proc_fin)
  323. - .section ".init.text", #alloc, #execinstr
  324. + .section ".init.text", "ax"
  325. __v7m_cm7_setup:
  326. mov r8, #(V7M_SCB_CCR_DC | V7M_SCB_CCR_IC| V7M_SCB_CCR_BP)
  327. @@ -177,7 +177,7 @@ ENDPROC(__v7m_setup)
  328. string cpu_elf_name "v7m"
  329. string cpu_v7m_name "ARMv7-M"
  330. - .section ".proc.info.init", #alloc
  331. + .section ".proc.info.init", "a"
  332. .macro __v7m_proc name, initfunc, cache_fns = nop_cache_fns, hwcaps = 0, proc_fns = v7m_processor_functions
  333. .long 0 /* proc_info_list.__cpu_mm_mmu_flags */
  334. diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
  335. index 1ac0fbbe9f12..42eaecc43cfe 100644
  336. --- a/arch/arm/mm/proc-xsc3.S
  337. +++ b/arch/arm/mm/proc-xsc3.S
  338. @@ -496,7 +496,7 @@ xsc3_crval:
  339. .align
  340. - .section ".proc.info.init", #alloc
  341. + .section ".proc.info.init", "a"
  342. .macro xsc3_proc_info name:req, cpu_val:req, cpu_mask:req
  343. .type __\name\()_proc_info,#object
  344. diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
  345. index bdb2b7749b03..18ac5a1f8922 100644
  346. --- a/arch/arm/mm/proc-xscale.S
  347. +++ b/arch/arm/mm/proc-xscale.S
  348. @@ -610,7 +610,7 @@ xscale_crval:
  349. .align
  350. - .section ".proc.info.init", #alloc
  351. + .section ".proc.info.init", "a"
  352. .macro xscale_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache
  353. .type __\name\()_proc_info,#object
  354. --
  355. 2.43.0