summaryrefslogtreecommitdiffstats
path: root/cpukit/score/cpu/m68k
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2005-10-27 07:29:04 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2005-10-27 07:29:04 +0000
commitc6ea319b12e225dbf795daac10a6003966919bea (patch)
treeb2f397c83cd30f5964322e13d0b71ac4ce44e343 /cpukit/score/cpu/m68k
parent2005-10-27 Ralf Corsepius <ralf.corsepius@rtems.org> (diff)
downloadrtems-c6ea319b12e225dbf795daac10a6003966919bea.tar.bz2
2005-10-27 Ralf Corsepius <ralf.corsepius@rtems.org>
* rtems/asm.h: Remove private version of CONCAT macros. Include <rtems/concat.h> instead.
Diffstat (limited to 'cpukit/score/cpu/m68k')
-rw-r--r--cpukit/score/cpu/m68k/ChangeLog5
-rw-r--r--cpukit/score/cpu/m68k/rtems/asm.h8
2 files changed, 6 insertions, 7 deletions
diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index d1d4ddb85d..bff904a9e3 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-27 Ralf Corsepius <ralf.corsepius@rtems.org>
+
+ * rtems/asm.h: Remove private version of CONCAT macros.
+ Include <rtems/concat.h> instead.
+
2005-06-07 Brett Swimley <brett.swimley@aedbozeman.com>
PR 803/patch
diff --git a/cpukit/score/cpu/m68k/rtems/asm.h b/cpukit/score/cpu/m68k/rtems/asm.h
index 180737315e..9381607dac 100644
--- a/cpukit/score/cpu/m68k/rtems/asm.h
+++ b/cpukit/score/cpu/m68k/rtems/asm.h
@@ -53,13 +53,7 @@
#define __REGISTER_PREFIX__
#endif
-/* ANSI concatenation macros. */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-#define EVAL(x) x
-#define CONCAT0(a, b) EVAL(a)EVAL(b)
+#include <rtems/concat.h>
/* Use the right prefix for global labels. */