Re: [PATCH] kselftest/riscv: Replace __ASSEMBLY__ with __ASSEMBLER__

[Nick Desaulniers]

On Thu, Aug 13, 2026 at 12:53 AM Thomas Huth <thuth@xxxxxxxxxx> wrote:
>
> From: Thomas Huth <thuth@xxxxxxxxxx>
>
> While the GCC and Clang compilers already define __ASSEMBLER__
> automatically when compiling assembly code, __ASSEMBLY__ is a
> macro that only gets defined by the Makefiles in the kernel.

Thank you for the patch.

Correct!
$ clang -dM -E -x assembler-with-cpp - < /dev/null | grep ASS
#define __ASSEMBLER__ 1
...

> This can be very confusing when switching between userspace
> and kernelspace coding, or when dealing with uapi headers that
> rather should use __ASSEMBLER__ instead. So let's standardize now
> on the __ASSEMBLER__ macro that is provided by the compilers.

Yes, thanks for cleaning up this legacy cruft. Godspeed on fixing the
rest of the kernel.
Reviewed-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>

>
> Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx>
> ---
>  tools/testing/selftests/riscv/cfi/cfi_rv_test.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/riscv/cfi/cfi_rv_test.h b/tools/testing/selftests/riscv/cfi/cfi_rv_test.h
> index 1c8043f2b778b..184df6903d01c 100644
> --- a/tools/testing/selftests/riscv/cfi/cfi_rv_test.h
> +++ b/tools/testing/selftests/riscv/cfi/cfi_rv_test.h
> @@ -56,7 +56,7 @@
>
>  #define CSR_SSP 0x011
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
>  #define __ASM_STR(x)    x
>  #else
>  #define __ASM_STR(x)    #x
> --
> 2.55.0
>


-- 
Thanks,
~Nick Desaulniers