| Message ID | 20240705132308.1469-1-jszhang@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | riscv: select ARCH_USE_SYM_ANNOTATIONS | expand |
On 05/07/2024 15:23, Jisheng Zhang wrote: > After commit 76329c693924 ("riscv: Use SYM_*() assembly macros instead > of deprecated ones"), riscv has been to the new style SYM_ assembler > annotations. So select ARCH_USE_SYM_ANNOTATIONS to ensure the > deprecated macros such as ENTRY(), END(), WEAK() and so on are not > available and we don't regress. Hi Jisheng, On which branch/series is it based ? I tried it and it fails on errata_cip-435.s which still contains some uses of ENTRY(): ENTRY(sifive_cip_453_page_fault_trp) Thanks, Clément > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > --- > arch/riscv/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 0525ee2d63c7..c51b32a8ddff 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -62,6 +62,7 @@ config RISCV > select ARCH_USE_CMPXCHG_LOCKREF if 64BIT > select ARCH_USE_MEMTEST > select ARCH_USE_QUEUED_RWLOCKS > + select ARCH_USE_SYM_ANNOTATIONS > select ARCH_USES_CFI_TRAPS if CFI_CLANG > select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if MMU > select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
On Mon, Jul 08, 2024 at 11:20:56AM +0200, Clément Léger wrote: > > > On 05/07/2024 15:23, Jisheng Zhang wrote: > > After commit 76329c693924 ("riscv: Use SYM_*() assembly macros instead > > of deprecated ones"), riscv has been to the new style SYM_ assembler > > annotations. So select ARCH_USE_SYM_ANNOTATIONS to ensure the > > deprecated macros such as ENTRY(), END(), WEAK() and so on are not > > available and we don't regress. > > Hi Jisheng, Hi Clément, > > On which branch/series is it based ? I tried it and it fails on > errata_cip-435.s which still contains some uses of ENTRY(): > > ENTRY(sifive_cip_453_page_fault_trp) aha, I see what happened. I did some asm -> c convesion [1] two weeks ago. I also converted the sifive_cip_453_page_fault_trp etc. to c as well, but I decided to not bring too many changes in the last minute, so the last patch wasn't sent out, but it's in my repo ;) I will send out v2 soon. Thank you so much! Link: https://lore.kernel.org/linux-riscv/20240616170553.2832-1-jszhang@kernel.org/ [1] > > Thanks, > > Clément > > > > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> > > --- > > arch/riscv/Kconfig | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > > index 0525ee2d63c7..c51b32a8ddff 100644 > > --- a/arch/riscv/Kconfig > > +++ b/arch/riscv/Kconfig > > @@ -62,6 +62,7 @@ config RISCV > > select ARCH_USE_CMPXCHG_LOCKREF if 64BIT > > select ARCH_USE_MEMTEST > > select ARCH_USE_QUEUED_RWLOCKS > > + select ARCH_USE_SYM_ANNOTATIONS > > select ARCH_USES_CFI_TRAPS if CFI_CLANG > > select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if MMU > > select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 0525ee2d63c7..c51b32a8ddff 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -62,6 +62,7 @@ config RISCV select ARCH_USE_CMPXCHG_LOCKREF if 64BIT select ARCH_USE_MEMTEST select ARCH_USE_QUEUED_RWLOCKS + select ARCH_USE_SYM_ANNOTATIONS select ARCH_USES_CFI_TRAPS if CFI_CLANG select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if MMU select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
After commit 76329c693924 ("riscv: Use SYM_*() assembly macros instead of deprecated ones"), riscv has been to the new style SYM_ assembler annotations. So select ARCH_USE_SYM_ANNOTATIONS to ensure the deprecated macros such as ENTRY(), END(), WEAK() and so on are not available and we don't regress. Signed-off-by: Jisheng Zhang <jszhang@kernel.org> --- arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)