From c6ea319b12e225dbf795daac10a6003966919bea Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 27 Oct 2005 07:29:04 +0000 Subject: 2005-10-27 Ralf Corsepius * rtems/asm.h: Remove private version of CONCAT macros. Include instead. --- cpukit/score/cpu/arm/ChangeLog | 5 +++++ cpukit/score/cpu/arm/rtems/asm.h | 5 +---- cpukit/score/cpu/avr/ChangeLog | 5 +++++ cpukit/score/cpu/avr/rtems/asm.h | 5 +---- cpukit/score/cpu/c4x/ChangeLog | 5 +++++ cpukit/score/cpu/c4x/rtems/asm.h | 5 +---- cpukit/score/cpu/h8300/ChangeLog | 5 +++++ cpukit/score/cpu/h8300/rtems/asm.h | 5 +---- cpukit/score/cpu/i386/ChangeLog | 5 +++++ cpukit/score/cpu/i386/rtems/asm.h | 8 +------- cpukit/score/cpu/m68k/ChangeLog | 5 +++++ cpukit/score/cpu/m68k/rtems/asm.h | 8 +------- cpukit/score/cpu/mips/ChangeLog | 5 +++++ cpukit/score/cpu/mips/rtems/asm.h | 5 +---- cpukit/score/cpu/no_cpu/ChangeLog | 5 +++++ cpukit/score/cpu/no_cpu/rtems/asm.h | 5 +---- cpukit/score/cpu/powerpc/ChangeLog | 5 +++++ cpukit/score/cpu/powerpc/rtems/asm.h | 5 +---- cpukit/score/cpu/sh/ChangeLog | 5 +++++ cpukit/score/cpu/sh/rtems/asm.h | 5 +---- cpukit/score/cpu/sparc/ChangeLog | 5 +++++ cpukit/score/cpu/sparc/rtems/asm.h | 5 +---- 22 files changed, 66 insertions(+), 50 deletions(-) (limited to 'cpukit/score') diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog index 3c21c3d4b2..ff1951777d 100644 --- a/cpukit/score/cpu/arm/ChangeLog +++ b/cpukit/score/cpu/arm/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ralf Corsepius + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-09-15 Jay Monkman PR 365/rtems diff --git a/cpukit/score/cpu/arm/rtems/asm.h b/cpukit/score/cpu/arm/rtems/asm.h index bbaf1ed4f4..5c33a2565a 100644 --- a/cpukit/score/cpu/arm/rtems/asm.h +++ b/cpukit/score/cpu/arm/rtems/asm.h @@ -57,10 +57,7 @@ #define __REGISTER_PREFIX__ #endif -/* ANSI concatenation macros. */ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b +#include /* Use the right prefix for global labels. */ diff --git a/cpukit/score/cpu/avr/ChangeLog b/cpukit/score/cpu/avr/ChangeLog index 22781c5450..0dc016c651 100644 --- a/cpukit/score/cpu/avr/ChangeLog +++ b/cpukit/score/cpu/avr/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ralf Corsepius + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-02-19 Ralf Corsepius * rtems/score/cpu.h: Remove traces from NO_CPU. diff --git a/cpukit/score/cpu/avr/rtems/asm.h b/cpukit/score/cpu/avr/rtems/asm.h index f8649c0f49..b2c25cc0ac 100644 --- a/cpukit/score/cpu/avr/rtems/asm.h +++ b/cpukit/score/cpu/avr/rtems/asm.h @@ -53,10 +53,7 @@ #define __REGISTER_PREFIX__ #endif -/* ANSI concatenation macros. */ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b +#include /* Use the right prefix for global labels. */ diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog index dd590aa68d..0dd0889d69 100644 --- a/cpukit/score/cpu/c4x/ChangeLog +++ b/cpukit/score/cpu/c4x/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ralf Corsepius + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-02-08 Ralf Corsepius * Makefile.am: Split out preinstallation rules. diff --git a/cpukit/score/cpu/c4x/rtems/asm.h b/cpukit/score/cpu/c4x/rtems/asm.h index 2311995e61..d99484e96c 100644 --- a/cpukit/score/cpu/c4x/rtems/asm.h +++ b/cpukit/score/cpu/c4x/rtems/asm.h @@ -53,10 +53,7 @@ #define __REGISTER_PREFIX__ #endif -/* ANSI concatenation macros. */ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b +#include /* Use the right prefix for global labels. */ diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog index bcbdc98f67..93f6ad3c37 100644 --- a/cpukit/score/cpu/h8300/ChangeLog +++ b/cpukit/score/cpu/h8300/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ralf Corsepius + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-02-19 Ralf Corsepius * rtems/score/cpu.h: Remove traces from NO_CPU. diff --git a/cpukit/score/cpu/h8300/rtems/asm.h b/cpukit/score/cpu/h8300/rtems/asm.h index eca784a49f..da3b80aeb7 100644 --- a/cpukit/score/cpu/h8300/rtems/asm.h +++ b/cpukit/score/cpu/h8300/rtems/asm.h @@ -55,10 +55,7 @@ #define __REGISTER_PREFIX__ #endif -/* ANSI concatenation macros. */ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b +#include /* Use the right prefix for global labels. */ diff --git a/cpukit/score/cpu/i386/ChangeLog b/cpukit/score/cpu/i386/ChangeLog index 5cfa419710..c435f7dc25 100644 --- a/cpukit/score/cpu/i386/ChangeLog +++ b/cpukit/score/cpu/i386/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ralf Corsepius + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-02-08 Ralf Corsepius * Makefile.am: Split out preinstallation rules. diff --git a/cpukit/score/cpu/i386/rtems/asm.h b/cpukit/score/cpu/i386/rtems/asm.h index 77e7e40f8b..7c6fcad58a 100644 --- a/cpukit/score/cpu/i386/rtems/asm.h +++ b/cpukit/score/cpu/i386/rtems/asm.h @@ -64,13 +64,7 @@ #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 /* Use the right prefix for global labels. */ 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 + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-06-07 Brett Swimley 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 /* Use the right prefix for global labels. */ diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog index e636fd9be5..03658f2a07 100644 --- a/cpukit/score/cpu/mips/ChangeLog +++ b/cpukit/score/cpu/mips/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ralf Corsepius + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-04-26 Joel Sherrill * rtems/asm.h: Eliminate warnings. diff --git a/cpukit/score/cpu/mips/rtems/asm.h b/cpukit/score/cpu/mips/rtems/asm.h index ee270dc865..c20c663509 100644 --- a/cpukit/score/cpu/mips/rtems/asm.h +++ b/cpukit/score/cpu/mips/rtems/asm.h @@ -54,10 +54,7 @@ #define __REGISTER_PREFIX__ #endif -/* ANSI concatenation macros. */ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b +#include /* Use the right prefix for global labels. */ diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog index b2d1ebfc93..4aeae7712d 100644 --- a/cpukit/score/cpu/no_cpu/ChangeLog +++ b/cpukit/score/cpu/no_cpu/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ralf Corsepius + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-02-08 Ralf Corsepius * Makefile.am: Split out preinstallation rules. diff --git a/cpukit/score/cpu/no_cpu/rtems/asm.h b/cpukit/score/cpu/no_cpu/rtems/asm.h index 7affe4f5b5..066b6f86ef 100644 --- a/cpukit/score/cpu/no_cpu/rtems/asm.h +++ b/cpukit/score/cpu/no_cpu/rtems/asm.h @@ -53,10 +53,7 @@ #define __REGISTER_PREFIX__ #endif -/* ANSI concatenation macros. */ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b +#include /* Use the right prefix for global labels. */ diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index 1406335279..a1a70dd223 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ralf Corsepius + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-05-06 Jennifer Averett * rtems/score/powerpc.h: Removed warning diff --git a/cpukit/score/cpu/powerpc/rtems/asm.h b/cpukit/score/cpu/powerpc/rtems/asm.h index a7297caa2c..b115d26c5a 100644 --- a/cpukit/score/cpu/powerpc/rtems/asm.h +++ b/cpukit/score/cpu/powerpc/rtems/asm.h @@ -64,10 +64,7 @@ #define __PROC_LABEL_PREFIX__ __USER_LABEL_PREFIX__ #endif -/* ANSI concatenation macros. */ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b +#include /* Use the right prefix for global labels. */ diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog index 358db980f3..50e4232269 100644 --- a/cpukit/score/cpu/sh/ChangeLog +++ b/cpukit/score/cpu/sh/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ralf Corsepius + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-02-19 Ralf Corsepius * rtems/score/cpu.h: Remove traces from NO_CPU. diff --git a/cpukit/score/cpu/sh/rtems/asm.h b/cpukit/score/cpu/sh/rtems/asm.h index b7009cb505..56e11313d7 100644 --- a/cpukit/score/cpu/sh/rtems/asm.h +++ b/cpukit/score/cpu/sh/rtems/asm.h @@ -69,10 +69,7 @@ #define __REGISTER_PREFIX__ #endif -/* ANSI concatenation macros. */ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b +#include /* Use the right prefix for global labels. */ diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog index d6a8079641..6f8b97d7b3 100644 --- a/cpukit/score/cpu/sparc/ChangeLog +++ b/cpukit/score/cpu/sparc/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ralf Corsepius + + * rtems/asm.h: Remove private version of CONCAT macros. + Include instead. + 2005-02-08 Ralf Corsepius * Makefile.am: Split out preinstallation rules. diff --git a/cpukit/score/cpu/sparc/rtems/asm.h b/cpukit/score/cpu/sparc/rtems/asm.h index 14ea9f155a..dafc584a64 100644 --- a/cpukit/score/cpu/sparc/rtems/asm.h +++ b/cpukit/score/cpu/sparc/rtems/asm.h @@ -55,10 +55,7 @@ #define __REGISTER_PREFIX__ #endif -/* ANSI concatenation macros. */ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b +#include /* Use the right prefix for global labels. */ -- cgit v1.2.3