[PATCH] soc: imx: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file

[PATCH] soc: imx: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file

[Thomas Huth]

From: Thomas Huth <thuth@redhat.com>

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.
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.

This is a completely mechanical patch (done with a simple "sed -i"
statement).

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 Note: This patch has been split from an earlier bigger patch of
 mine to ease reviewing.

 include/soc/imx/cpu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/soc/imx/cpu.h b/include/soc/imx/cpu.h
index 0bf610acafd06..8c53150acd76e 100644
--- a/include/soc/imx/cpu.h
+++ b/include/soc/imx/cpu.h
@@ -30,7 +30,7 @@
 #define MXC_CPU_VF600		0x600
 #define MXC_CPU_VF610		(MXC_CPU_VF600 | MXC_CPU_VFx10)
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 extern unsigned int __mxc_cpu_type;
 #endif
 
-- 
2.54.0

Re: [PATCH] soc: imx: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file

[Thomas Huth]

On 19/06/2026 14.24, Thomas Huth wrote:
> From: Thomas Huth <thuth@redhat.com>
> 
> 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.
> 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.
> 
> This is a completely mechanical patch (done with a simple "sed -i"
> statement).
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   Note: This patch has been split from an earlier bigger patch of
>   mine to ease reviewing.
> 
>   include/soc/imx/cpu.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/soc/imx/cpu.h b/include/soc/imx/cpu.h
> index 0bf610acafd06..8c53150acd76e 100644
> --- a/include/soc/imx/cpu.h
> +++ b/include/soc/imx/cpu.h
> @@ -30,7 +30,7 @@
>   #define MXC_CPU_VF600		0x600
>   #define MXC_CPU_VF610		(MXC_CPU_VF600 | MXC_CPU_VFx10)
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   extern unsigned int __mxc_cpu_type;
>   #endif
>   

Friendly ping!

Could anybody please pick this up? Thanks!

  Thomas

Re: [PATCH] soc: imx: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file

[Frank Li]

On Thu, Aug 13, 2026 at 09:35:38AM +0200, Thomas Huth wrote:
>
> On 19/06/2026 14.24, Thomas Huth wrote:
> > From: Thomas Huth <thuth@redhat.com>
> >
> > 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.
> > 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.
> >
> > This is a completely mechanical patch (done with a simple "sed -i"
> > statement).
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> >   Note: This patch has been split from an earlier bigger patch of
> >   mine to ease reviewing.
> >
> >   include/soc/imx/cpu.h | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/include/soc/imx/cpu.h b/include/soc/imx/cpu.h
> > index 0bf610acafd06..8c53150acd76e 100644
> > --- a/include/soc/imx/cpu.h
> > +++ b/include/soc/imx/cpu.h
> > @@ -30,7 +30,7 @@
> >   #define MXC_CPU_VF600               0x600
> >   #define MXC_CPU_VF610               (MXC_CPU_VF600 | MXC_CPU_VFx10)
> >
> > -#ifndef __ASSEMBLY__
> > +#ifndef __ASSEMBLER__
> >   extern unsigned int __mxc_cpu_type;
> >   #endif
> >
>
> Friendly ping!
>
> Could anybody please pick this up? Thanks!

Sorry, I missed it. It is too late for 7.3.

Frank

>
>  Thomas
>
>

Re: [PATCH] soc: imx: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file

[Frank.Li]

From: Frank Li <Frank.Li@nxp.com>


On Fri, 19 Jun 2026 14:24:48 +0200, Thomas Huth wrote:
> 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.
> 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.
> 
> [...]

Applied, thanks!

[1/1] soc: imx: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file
      commit: 9d183de1df061377bf5d29f33dc4814382187649

Best regards,
-- 
Frank Li <Frank.Li@nxp.com>