Removed definitions which are now in targopts.h. This eliminates the

need for the "sed'ing" of this file.  This should be a significant win
when addressing non-unix host and non-gnu toolsets.

c/src/exec/score/cpu/a29k/a29k.h

@@ -19,28 +19,6 @@
 extern "C" {
 #endif
 
-/*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef a29k
-#undef a29k
-#endif
-#define a29k
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
- 
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
 /*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the "no cpu"

c/src/exec/score/cpu/hppa1.1/hppa.h

@@ -31,28 +31,6 @@
 extern "C" {
 #endif
 
-/*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef hppa1_1
-#undef hppa1_1
-#endif
-#define hppa1_1
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
-
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
 /*
  *  This section contains the information required to build
  *  RTEMS for a particular member of the Hewlett Packard

c/src/exec/score/cpu/i386/i386.h

@@ -21,28 +21,6 @@
 extern "C" {
 #endif
 
-/*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
-
-#ifdef i386
-#undef i386
-#endif
-#define i386 1
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
-
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
 /*
  *  This section contains the information required to build
  *  RTEMS for a particular member of the Intel i386

c/src/exec/score/cpu/i960/i960.h

@@ -21,28 +21,6 @@
 extern "C" {
 #endif
 
-/*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef i960
-#undef i960
-#endif
-#define i960
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
-
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
 /*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the Intel i960

c/src/exec/score/cpu/m68k/m68k.h

@@ -21,28 +21,6 @@
 extern "C" {
 #endif
 
-/*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef m68k
-#undef m68k
-#endif
-#define m68k
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
-
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
 /*
  *  This section contains the information required to build
  *  RTEMS for a particular member of the Motorola MC68xxx

c/src/exec/score/cpu/mips64orion/mips64orion.h

@@ -35,28 +35,6 @@
 extern "C" {
 #endif
 
-/*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef mips64orion
-#undef mips64orion
-#endif
-#define mips64orion
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
- 
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
 /*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the "no cpu"

c/src/exec/score/cpu/no_cpu/no_cpu.h

@@ -22,28 +22,6 @@
 extern "C" {
 #endif
 
-/*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef no_cpu
-#undef no_cpu
-#endif
-#define no_cpu
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
- 
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
 /*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the "no cpu"

c/src/exec/score/cpu/powerpc/ppc.h

@@ -41,28 +41,6 @@
 extern "C" {
 #endif
 
-/*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef ppc
-#undef ppc
-#endif
-#define ppc
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
- 
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
 /*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the "no cpu"

c/src/exec/score/cpu/unix/unix.h

@@ -21,38 +21,6 @@
 extern "C" {
 #endif
 
-/*
- *  The following define the CPU Family and Model within the family
- *
- *  NOTE: The string "REPLACE_THIS_WITH_THE_CPU_MODEL" is replaced
- *        with the name of the appropriate macro for this target CPU.
- */
- 
-#ifdef unix
-#undef unix
-#endif
-#define unix
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_FAMILY
-#undef REPLACE_THIS_WITH_THE_CPU_FAMILY
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_FAMILY
-
-#ifdef REPLACE_THIS_WITH_THE_BSP
-#undef REPLACE_THIS_WITH_THE_BSP
-#endif
-#define REPLACE_THIS_WITH_THE_BSP
-
-#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
-#undef REPLACE_THIS_WITH_THE_CPU_MODEL
-#endif
-#define REPLACE_THIS_WITH_THE_CPU_MODEL
-
-#ifdef REPLACE_THIS_WITH_THE_UNIX_FLAVOR
-#undef REPLACE_THIS_WITH_THE_UNIX_FLAVOR
-#endif
-#define REPLACE_THIS_WITH_THE_UNIX_FLAVOR
-
 /*
  *  This file contains the information required to build
  *  RTEMS for a particular member of the "unix"

c/src/exec/score/headers/system.h

@@ -23,16 +23,12 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
+ *  The target options include file defines all target dependent 
- *
+ *  parameters for this build of RTEMS.  It must be included
- *  NOTE: The string "REPLACE_THIS_WITH_USE_INLINE_OR_MACROS" is replaced
+ *  first so the basic macro definitions are in place.
- *        with either "USE_INLINES" or "USE_MACROS" based upon the
- *        whether this target configuration uses the inline or
- *        macro implementations of the inlined RTEMS routines.
  */
 
-
+#include <rtems/score/targopts.h>
-#define REPLACE_THIS_WITH_USE_INLINE_OR_MACROS
 
 /*
  *  The following insures that all data is declared in the space

c/src/exec/score/include/rtems/system.h

@@ -23,16 +23,12 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
+ *  The target options include file defines all target dependent 
- *
+ *  parameters for this build of RTEMS.  It must be included
- *  NOTE: The string "REPLACE_THIS_WITH_USE_INLINE_OR_MACROS" is replaced
+ *  first so the basic macro definitions are in place.
- *        with either "USE_INLINES" or "USE_MACROS" based upon the
- *        whether this target configuration uses the inline or
- *        macro implementations of the inlined RTEMS routines.
  */
 
-
+#include <rtems/score/targopts.h>
-#define REPLACE_THIS_WITH_USE_INLINE_OR_MACROS
 
 /*
  *  The following insures that all data is declared in the space

cpukit/score/include/rtems/system.h

@@ -23,16 +23,12 @@ extern "C" {
 #endif
 
 /*
- *  The following define the CPU Family and Model within the family
+ *  The target options include file defines all target dependent 
- *
+ *  parameters for this build of RTEMS.  It must be included
- *  NOTE: The string "REPLACE_THIS_WITH_USE_INLINE_OR_MACROS" is replaced
+ *  first so the basic macro definitions are in place.
- *        with either "USE_INLINES" or "USE_MACROS" based upon the
- *        whether this target configuration uses the inline or
- *        macro implementations of the inlined RTEMS routines.
  */
 
-
+#include <rtems/score/targopts.h>
-#define REPLACE_THIS_WITH_USE_INLINE_OR_MACROS
 
 /*
  *  The following insures that all data is declared in the space