Skip to contentSkip to conversation

soc: imx: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file

PATCH Applied Thomas Huth 2 participants 4 messages Jun 19 – Aug 31 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: imx: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file

From: Thomas Huth <[email protected]>

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

---
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(-)
include/soc/imx/cpu.h +1 -1
index 0bf610acafd06..8c53150acd76e 100644
@@ -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
 
Signature · 1 line
2.54.0
#1 lore raw
Quoted 26 lines · Thomas Huth

From: Thomas Huth <[email protected]>

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

---
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(-)
include/soc/imx/cpu.h +0 -0
index 0bf610acafd06..8c53150acd76e 100644

include/soc/imx/cpu.h line 36

Quoted 8 lines
include/soc/imx/cpu.h +1 -1
@@ -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

#2 lore raw
Quoted 39 lines · Thomas Huth
Quoted 26 lines · Thomas Huth

From: Thomas Huth <[email protected]>

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

---
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(-)
include/soc/imx/cpu.h +0 -0
index 0bf610acafd06..8c53150acd76e 100644

include/soc/imx/cpu.h line 36

Quoted 8 lines
include/soc/imx/cpu.h +1 -1
@@ -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!

Quoted 1 line

Could anybody please pick this up? Thanks!

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

Frank

Quoted 4 lines

Thomas

#3 lore raw
In reply to Thomas Huth

From: Frank Li <[email protected]>

Quoted 9 lines · Thomas Huth

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,

Signature · 1 line
Frank Li <[email protected]>