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

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435
  1. From 762d2dcd9e233e3025f8627ea65f23e568045edb 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. [ Upstream commit 790756c7e0229dedc83bf058ac69633045b1000e ]
  7. It looks like a section directive was using "Solaris style" to declare
  8. the section flags. Replace this with the GNU style so that Clang's
  9. integrated assembler can assemble this directive.
  10. The modified instances were identified via:
  11. $ ag \.section | grep #
  12. Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119
  13. Link: https://github.com/ClangBuiltLinux/linux/issues/744
  14. Link: https://bugs.llvm.org/show_bug.cgi?id=43759
  15. Link: https://reviews.llvm.org/D69296
  16. Acked-by: Nicolas Pitre <nico@fluxnic.net>
  17. Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
  18. Reviewed-by: Stefan Agner <stefan@agner.ch>
  19. Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
  20. Suggested-by: Fangrui Song <maskray@google.com>
  21. Suggested-by: Jian Cai <jiancai@google.com>
  22. Suggested-by: Peter Smith <peter.smith@linaro.org>
  23. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  24. Signed-off-by: Sasha Levin <sashal@kernel.org>
  25. Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=762d2dcd9e233e3025f8627ea65f23e568045edb
  26. ---
  27. arch/arm/boot/bootp/init.S | 2 +-
  28. arch/arm/boot/compressed/big-endian.S | 2 +-
  29. arch/arm/boot/compressed/head.S | 2 +-
  30. arch/arm/boot/compressed/piggy.S | 2 +-
  31. arch/arm/mm/proc-arm1020.S | 2 +-
  32. arch/arm/mm/proc-arm1020e.S | 2 +-
  33. arch/arm/mm/proc-arm1022.S | 2 +-
  34. arch/arm/mm/proc-arm1026.S | 2 +-
  35. arch/arm/mm/proc-arm720.S | 2 +-
  36. arch/arm/mm/proc-arm740.S | 2 +-
  37. arch/arm/mm/proc-arm7tdmi.S | 2 +-
  38. arch/arm/mm/proc-arm920.S | 2 +-
  39. arch/arm/mm/proc-arm922.S | 2 +-
  40. arch/arm/mm/proc-arm925.S | 2 +-
  41. arch/arm/mm/proc-arm926.S | 2 +-
  42. arch/arm/mm/proc-arm940.S | 2 +-
  43. arch/arm/mm/proc-arm946.S | 2 +-
  44. arch/arm/mm/proc-arm9tdmi.S | 2 +-
  45. arch/arm/mm/proc-fa526.S | 2 +-
  46. arch/arm/mm/proc-feroceon.S | 2 +-
  47. arch/arm/mm/proc-mohawk.S | 2 +-
  48. arch/arm/mm/proc-sa110.S | 2 +-
  49. arch/arm/mm/proc-sa1100.S | 2 +-
  50. arch/arm/mm/proc-v6.S | 2 +-
  51. arch/arm/mm/proc-v7.S | 2 +-
  52. arch/arm/mm/proc-v7m.S | 4 ++--
  53. arch/arm/mm/proc-xsc3.S | 2 +-
  54. arch/arm/mm/proc-xscale.S | 2 +-
  55. 28 files changed, 29 insertions(+), 29 deletions(-)
  56. diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
  57. index 78b508075161..868eeeaaa46e 100644
  58. --- a/arch/arm/boot/bootp/init.S
  59. +++ b/arch/arm/boot/bootp/init.S
  60. @@ -16,7 +16,7 @@
  61. * size immediately following the kernel, we could build this into
  62. * a binary blob, and concatenate the zImage using the cat command.
  63. */
  64. - .section .start,#alloc,#execinstr
  65. + .section .start, "ax"
  66. .type _start, #function
  67. .globl _start
  68. diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
  69. index 88e2a88d324b..0e092c36da2f 100644
  70. --- a/arch/arm/boot/compressed/big-endian.S
  71. +++ b/arch/arm/boot/compressed/big-endian.S
  72. @@ -6,7 +6,7 @@
  73. * Author: Nicolas Pitre
  74. */
  75. - .section ".start", #alloc, #execinstr
  76. + .section ".start", "ax"
  77. mrc p15, 0, r0, c1, c0, 0 @ read control reg
  78. orr r0, r0, #(1 << 7) @ enable big endian mode
  79. diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
  80. index 69e661f574a0..e4d1b3d0b7d9 100644
  81. --- a/arch/arm/boot/compressed/head.S
  82. +++ b/arch/arm/boot/compressed/head.S
  83. @@ -114,7 +114,7 @@
  84. #endif
  85. .endm
  86. - .section ".start", #alloc, #execinstr
  87. + .section ".start", "ax"
  88. /*
  89. * sort out different calling conventions
  90. */
  91. diff --git a/arch/arm/boot/compressed/piggy.S b/arch/arm/boot/compressed/piggy.S
  92. index 0284f84dcf38..27577644ee72 100644
  93. --- a/arch/arm/boot/compressed/piggy.S
  94. +++ b/arch/arm/boot/compressed/piggy.S
  95. @@ -1,5 +1,5 @@
  96. /* SPDX-License-Identifier: GPL-2.0 */
  97. - .section .piggydata,#alloc
  98. + .section .piggydata, "a"
  99. .globl input_data
  100. input_data:
  101. .incbin "arch/arm/boot/compressed/piggy_data"
  102. diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
  103. index 774ef1323554..4773490177c9 100644
  104. --- a/arch/arm/mm/proc-arm1020.S
  105. +++ b/arch/arm/mm/proc-arm1020.S
  106. @@ -505,7 +505,7 @@ cpu_arm1020_name:
  107. .align
  108. - .section ".proc.info.init", #alloc
  109. + .section ".proc.info.init", "a"
  110. .type __arm1020_proc_info,#object
  111. __arm1020_proc_info:
  112. diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
  113. index ae3c27b71594..928e8ca58f40 100644
  114. --- a/arch/arm/mm/proc-arm1020e.S
  115. +++ b/arch/arm/mm/proc-arm1020e.S
  116. @@ -463,7 +463,7 @@ arm1020e_crval:
  117. .align
  118. - .section ".proc.info.init", #alloc
  119. + .section ".proc.info.init", "a"
  120. .type __arm1020e_proc_info,#object
  121. __arm1020e_proc_info:
  122. diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
  123. index dbb2413fe04d..385584c3d222 100644
  124. --- a/arch/arm/mm/proc-arm1022.S
  125. +++ b/arch/arm/mm/proc-arm1022.S
  126. @@ -448,7 +448,7 @@ arm1022_crval:
  127. .align
  128. - .section ".proc.info.init", #alloc
  129. + .section ".proc.info.init", "a"
  130. .type __arm1022_proc_info,#object
  131. __arm1022_proc_info:
  132. diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
  133. index 0b37b2cef9d3..29cc81857373 100644
  134. --- a/arch/arm/mm/proc-arm1026.S
  135. +++ b/arch/arm/mm/proc-arm1026.S
  136. @@ -442,7 +442,7 @@ arm1026_crval:
  137. string cpu_arm1026_name, "ARM1026EJ-S"
  138. .align
  139. - .section ".proc.info.init", #alloc
  140. + .section ".proc.info.init", "a"
  141. .type __arm1026_proc_info,#object
  142. __arm1026_proc_info:
  143. diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
  144. index 3651cd70e418..c08cd1b0a1d0 100644
  145. --- a/arch/arm/mm/proc-arm720.S
  146. +++ b/arch/arm/mm/proc-arm720.S
  147. @@ -186,7 +186,7 @@ arm720_crval:
  148. * See <asm/procinfo.h> for a definition of this structure.
  149. */
  150. - .section ".proc.info.init", #alloc
  151. + .section ".proc.info.init", "a"
  152. .macro arm720_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cpu_flush:req
  153. .type __\name\()_proc_info,#object
  154. diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
  155. index 024fb7732407..6eed87103b95 100644
  156. --- a/arch/arm/mm/proc-arm740.S
  157. +++ b/arch/arm/mm/proc-arm740.S
  158. @@ -132,7 +132,7 @@ __arm740_setup:
  159. .align
  160. - .section ".proc.info.init", #alloc
  161. + .section ".proc.info.init", "a"
  162. .type __arm740_proc_info,#object
  163. __arm740_proc_info:
  164. .long 0x41807400
  165. diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
  166. index 25472d94426d..beb64a7ccb38 100644
  167. --- a/arch/arm/mm/proc-arm7tdmi.S
  168. +++ b/arch/arm/mm/proc-arm7tdmi.S
  169. @@ -76,7 +76,7 @@ __arm7tdmi_setup:
  170. .align
  171. - .section ".proc.info.init", #alloc
  172. + .section ".proc.info.init", "a"
  173. .macro arm7tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, \
  174. extra_hwcaps=0
  175. diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
  176. index 7a14bd4414c9..5d4319708362 100644
  177. --- a/arch/arm/mm/proc-arm920.S
  178. +++ b/arch/arm/mm/proc-arm920.S
  179. @@ -448,7 +448,7 @@ arm920_crval:
  180. .align
  181. - .section ".proc.info.init", #alloc
  182. + .section ".proc.info.init", "a"
  183. .type __arm920_proc_info,#object
  184. __arm920_proc_info:
  185. diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
  186. index edccfcdcd551..7e22ca780b36 100644
  187. --- a/arch/arm/mm/proc-arm922.S
  188. +++ b/arch/arm/mm/proc-arm922.S
  189. @@ -426,7 +426,7 @@ arm922_crval:
  190. .align
  191. - .section ".proc.info.init", #alloc
  192. + .section ".proc.info.init", "a"
  193. .type __arm922_proc_info,#object
  194. __arm922_proc_info:
  195. diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
  196. index 32a47cc19076..d343e77b8456 100644
  197. --- a/arch/arm/mm/proc-arm925.S
  198. +++ b/arch/arm/mm/proc-arm925.S
  199. @@ -491,7 +491,7 @@ arm925_crval:
  200. .align
  201. - .section ".proc.info.init", #alloc
  202. + .section ".proc.info.init", "a"
  203. .macro arm925_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache
  204. .type __\name\()_proc_info,#object
  205. diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
  206. index fb827c633693..8cf78c608c42 100644
  207. --- a/arch/arm/mm/proc-arm926.S
  208. +++ b/arch/arm/mm/proc-arm926.S
  209. @@ -474,7 +474,7 @@ arm926_crval:
  210. .align
  211. - .section ".proc.info.init", #alloc
  212. + .section ".proc.info.init", "a"
  213. .type __arm926_proc_info,#object
  214. __arm926_proc_info:
  215. diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
  216. index ee5b66f847c4..631ae64eeccd 100644
  217. --- a/arch/arm/mm/proc-arm940.S
  218. +++ b/arch/arm/mm/proc-arm940.S
  219. @@ -344,7 +344,7 @@ __arm940_setup:
  220. .align
  221. - .section ".proc.info.init", #alloc
  222. + .section ".proc.info.init", "a"
  223. .type __arm940_proc_info,#object
  224. __arm940_proc_info:
  225. diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
  226. index 7361837edc31..033ad7402d67 100644
  227. --- a/arch/arm/mm/proc-arm946.S
  228. +++ b/arch/arm/mm/proc-arm946.S
  229. @@ -399,7 +399,7 @@ __arm946_setup:
  230. .align
  231. - .section ".proc.info.init", #alloc
  232. + .section ".proc.info.init", "a"
  233. .type __arm946_proc_info,#object
  234. __arm946_proc_info:
  235. .long 0x41009460
  236. diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
  237. index 7fac8c612134..2195468ccd76 100644
  238. --- a/arch/arm/mm/proc-arm9tdmi.S
  239. +++ b/arch/arm/mm/proc-arm9tdmi.S
  240. @@ -70,7 +70,7 @@ __arm9tdmi_setup:
  241. .align
  242. - .section ".proc.info.init", #alloc
  243. + .section ".proc.info.init", "a"
  244. .macro arm9tdmi_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req
  245. .type __\name\()_proc_info, #object
  246. diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S
  247. index 4001b73af4ee..fd3e5dd94e59 100644
  248. --- a/arch/arm/mm/proc-fa526.S
  249. +++ b/arch/arm/mm/proc-fa526.S
  250. @@ -190,7 +190,7 @@ fa526_cr1_set:
  251. .align
  252. - .section ".proc.info.init", #alloc
  253. + .section ".proc.info.init", "a"
  254. .type __fa526_proc_info,#object
  255. __fa526_proc_info:
  256. diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
  257. index 92e08bf37aad..685d324a74d3 100644
  258. --- a/arch/arm/mm/proc-feroceon.S
  259. +++ b/arch/arm/mm/proc-feroceon.S
  260. @@ -584,7 +584,7 @@ feroceon_crval:
  261. .align
  262. - .section ".proc.info.init", #alloc
  263. + .section ".proc.info.init", "a"
  264. .macro feroceon_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache:req
  265. .type __\name\()_proc_info,#object
  266. diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
  267. index 6f07d2ef4ff2..9182321a586a 100644
  268. --- a/arch/arm/mm/proc-mohawk.S
  269. +++ b/arch/arm/mm/proc-mohawk.S
  270. @@ -429,7 +429,7 @@ mohawk_crval:
  271. .align
  272. - .section ".proc.info.init", #alloc
  273. + .section ".proc.info.init", "a"
  274. .type __88sv331x_proc_info,#object
  275. __88sv331x_proc_info:
  276. diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
  277. index ee2ce496239f..093ad2ceff28 100644
  278. --- a/arch/arm/mm/proc-sa110.S
  279. +++ b/arch/arm/mm/proc-sa110.S
  280. @@ -199,7 +199,7 @@ sa110_crval:
  281. .align
  282. - .section ".proc.info.init", #alloc
  283. + .section ".proc.info.init", "a"
  284. .type __sa110_proc_info,#object
  285. __sa110_proc_info:
  286. diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
  287. index 222d5836f666..12b8fcab4b59 100644
  288. --- a/arch/arm/mm/proc-sa1100.S
  289. +++ b/arch/arm/mm/proc-sa1100.S
  290. @@ -242,7 +242,7 @@ sa1100_crval:
  291. .align
  292. - .section ".proc.info.init", #alloc
  293. + .section ".proc.info.init", "a"
  294. .macro sa1100_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req
  295. .type __\name\()_proc_info,#object
  296. diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
  297. index 06d890a2342b..32f4df0915ef 100644
  298. --- a/arch/arm/mm/proc-v6.S
  299. +++ b/arch/arm/mm/proc-v6.S
  300. @@ -264,7 +264,7 @@ v6_crval:
  301. string cpu_elf_name, "v6"
  302. .align
  303. - .section ".proc.info.init", #alloc
  304. + .section ".proc.info.init", "a"
  305. /*
  306. * Match any ARMv6 processor core.
  307. diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
  308. index 339eb17c9808..e351d682c2e3 100644
  309. --- a/arch/arm/mm/proc-v7.S
  310. +++ b/arch/arm/mm/proc-v7.S
  311. @@ -637,7 +637,7 @@ __v7_setup_stack:
  312. string cpu_elf_name, "v7"
  313. .align
  314. - .section ".proc.info.init", #alloc
  315. + .section ".proc.info.init", "a"
  316. /*
  317. * Standard v7 proc info content
  318. diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S
  319. index 9c2978c128d9..0be14b64879c 100644
  320. --- a/arch/arm/mm/proc-v7m.S
  321. +++ b/arch/arm/mm/proc-v7m.S
  322. @@ -96,7 +96,7 @@ ENTRY(cpu_cm7_proc_fin)
  323. ret lr
  324. ENDPROC(cpu_cm7_proc_fin)
  325. - .section ".init.text", #alloc, #execinstr
  326. + .section ".init.text", "ax"
  327. __v7m_cm7_setup:
  328. mov r8, #(V7M_SCB_CCR_DC | V7M_SCB_CCR_IC| V7M_SCB_CCR_BP)
  329. @@ -180,7 +180,7 @@ ENDPROC(__v7m_setup)
  330. string cpu_elf_name "v7m"
  331. string cpu_v7m_name "ARMv7-M"
  332. - .section ".proc.info.init", #alloc
  333. + .section ".proc.info.init", "a"
  334. .macro __v7m_proc name, initfunc, cache_fns = nop_cache_fns, hwcaps = 0, proc_fns = v7m_processor_functions
  335. .long 0 /* proc_info_list.__cpu_mm_mmu_flags */
  336. diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
  337. index 293dcc2c441f..da96e4de1353 100644
  338. --- a/arch/arm/mm/proc-xsc3.S
  339. +++ b/arch/arm/mm/proc-xsc3.S
  340. @@ -499,7 +499,7 @@ xsc3_crval:
  341. .align
  342. - .section ".proc.info.init", #alloc
  343. + .section ".proc.info.init", "a"
  344. .macro xsc3_proc_info name:req, cpu_val:req, cpu_mask:req
  345. .type __\name\()_proc_info,#object
  346. diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
  347. index 3d75b7972fd1..c7800c69921b 100644
  348. --- a/arch/arm/mm/proc-xscale.S
  349. +++ b/arch/arm/mm/proc-xscale.S
  350. @@ -613,7 +613,7 @@ xscale_crval:
  351. .align
  352. - .section ".proc.info.init", #alloc
  353. + .section ".proc.info.init", "a"
  354. .macro xscale_proc_info name:req, cpu_val:req, cpu_mask:req, cpu_name:req, cache
  355. .type __\name\()_proc_info,#object
  356. --
  357. 2.43.0