[PATCH] powerpc: Use RTEMS_XCONCAT()

Sebastian Huber sebastian.huber at embedded-brains.de
Tue Feb 27 15:20:48 UTC 2024


Prefer macros with a proper namespace.
---
 cpukit/score/cpu/powerpc/include/rtems/asm.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/cpukit/score/cpu/powerpc/include/rtems/asm.h b/cpukit/score/cpu/powerpc/include/rtems/asm.h
index 27af64e724..94f54245b4 100644
--- a/cpukit/score/cpu/powerpc/include/rtems/asm.h
+++ b/cpukit/score/cpu/powerpc/include/rtems/asm.h
@@ -75,23 +75,21 @@
 #define __PROC_LABEL_PREFIX__  __USER_LABEL_PREFIX__
 #endif
 
-#include <rtems/concat.h>
-
 /* Use the right prefix for global labels.  */
 
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
+#define SYM(x) RTEMS_XCONCAT (__USER_LABEL_PREFIX__, x)
 
 /* Use the right prefix for procedure labels.  */
 
-#define PROC(x) CONCAT1 (__PROC_LABEL_PREFIX__, x)
+#define PROC(x) RTEMS_XCONCAT (__PROC_LABEL_PREFIX__, x)
 
 /* Use the right prefix for registers.  */
 
-#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x)
+#define REG(x) RTEMS_XCONCAT (__REGISTER_PREFIX__, x)
 
 /* Use the right prefix for floating point registers.  */
 
-#define FREG(x) CONCAT1 (__FLOAT_REGISTER_PREFIX__, x)
+#define FREG(x) RTEMS_XCONCAT (__FLOAT_REGISTER_PREFIX__, x)
 
 /*
  *  define macros for all of the registers on this CPU
-- 
2.35.3



More information about the devel mailing list