From 5e9b32b439627068a0292370fe595220dbfc95a0 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 26 Sep 1995 19:27:15 +0000
Subject: posix support initially added

---
 c/src/exec/score/cpu/hppa1.1/cpu.c     |  4 ++--
 c/src/exec/score/cpu/hppa1.1/cpu.h     |  4 ++--
 c/src/exec/score/cpu/hppa1.1/cpu_asm.s |  8 ++++----
 c/src/exec/score/cpu/hppa1.1/hppa.h    |  8 ++++----
 c/src/exec/score/cpu/hppa1.1/rtems.s   |  4 ++--
 c/src/exec/score/cpu/i386/asm.h        |  2 +-
 c/src/exec/score/cpu/i386/cpu.c        |  4 ++--
 c/src/exec/score/cpu/i386/cpu.h        |  4 ++--
 c/src/exec/score/cpu/i386/i386.h       | 10 +++++-----
 c/src/exec/score/cpu/i960/asm.h        |  2 +-
 c/src/exec/score/cpu/i960/cpu.c        |  2 +-
 c/src/exec/score/cpu/i960/cpu.h        |  4 ++--
 c/src/exec/score/cpu/i960/i960.h       |  2 +-
 c/src/exec/score/cpu/m68k/asm.h        |  2 +-
 c/src/exec/score/cpu/m68k/cpu.c        |  2 +-
 c/src/exec/score/cpu/m68k/cpu.h        |  4 ++--
 c/src/exec/score/cpu/m68k/m68k.h       | 16 ++++++++--------
 c/src/exec/score/cpu/no_cpu/asm.h      |  2 +-
 c/src/exec/score/cpu/no_cpu/cpu.c      |  4 ++--
 c/src/exec/score/cpu/no_cpu/cpu.h      |  4 ++--
 c/src/exec/score/cpu/no_cpu/cpu_asm.c  |  2 +-
 c/src/exec/score/cpu/no_cpu/cpu_asm.h  |  2 +-
 c/src/exec/score/cpu/no_cpu/no_cpu.h   |  2 +-
 c/src/exec/score/cpu/no_cpu/rtems.c    |  2 +-
 c/src/exec/score/cpu/powerpc/cpu.c     |  8 ++++----
 c/src/exec/score/cpu/powerpc/cpu.h     |  4 ++--
 c/src/exec/score/cpu/powerpc/ppc.h     | 12 ++++++------
 c/src/exec/score/cpu/unix/cpu.c        |  4 ++--
 c/src/exec/score/cpu/unix/cpu.h        |  4 ++--
 c/src/exec/score/cpu/unix/unix.h       |  6 +++---
 30 files changed, 69 insertions(+), 69 deletions(-)

(limited to 'c/src/exec/score/cpu')

diff --git a/c/src/exec/score/cpu/hppa1.1/cpu.c b/c/src/exec/score/cpu/hppa1.1/cpu.c
index 3fb36ec00b..f132033595 100644
--- a/c/src/exec/score/cpu/hppa1.1/cpu.c
+++ b/c/src/exec/score/cpu/hppa1.1/cpu.c
@@ -18,8 +18,8 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/wkspace.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/wkspace.h>
 
 void hppa_external_interrupt_initialize(void);
 void hppa_external_interrupt_enable(unsigned32);
diff --git a/c/src/exec/score/cpu/hppa1.1/cpu.h b/c/src/exec/score/cpu/hppa1.1/cpu.h
index e1f6cbfa48..af3573d9a8 100644
--- a/c/src/exec/score/cpu/hppa1.1/cpu.h
+++ b/c/src/exec/score/cpu/hppa1.1/cpu.h
@@ -30,9 +30,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/hppa.h>              /* pick up machine definitions */
+#include <rtems/score/hppa.h>              /* pick up machine definitions */
 #ifndef ASM
-#include <rtems/core/hppatypes.h>
+#include <rtems/score/hppatypes.h>
 #endif
 
 /* conditional compilation parameters */
diff --git a/c/src/exec/score/cpu/hppa1.1/cpu_asm.s b/c/src/exec/score/cpu/hppa1.1/cpu_asm.s
index 7b9e940b77..afca4b773f 100644
--- a/c/src/exec/score/cpu/hppa1.1/cpu_asm.s
+++ b/c/src/exec/score/cpu/hppa1.1/cpu_asm.s
@@ -27,11 +27,11 @@
 #  $Id$
 #
 
-#include <rtems/core/hppa.h>
-#include <rtems/core/cpu_asm.h>
-#include <rtems/core/cpu.h>
+#include <rtems/score/hppa.h>
+#include <rtems/score/cpu_asm.h>
+#include <rtems/score/cpu.h>
 
-#include <rtems/core/offsets.h>
+#include <rtems/score/offsets.h>
 
 	.SPACE $PRIVATE$
 	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
diff --git a/c/src/exec/score/cpu/hppa1.1/hppa.h b/c/src/exec/score/cpu/hppa1.1/hppa.h
index 801a2edca2..74691eb1a7 100644
--- a/c/src/exec/score/cpu/hppa1.1/hppa.h
+++ b/c/src/exec/score/cpu/hppa1.1/hppa.h
@@ -64,15 +64,15 @@ extern "C" {
  *  present in a particular member of the family.
  */
 
-#if !defined(RTEMS_MODEL_NAME)
+#if !defined(CPU_MODEL_NAME)
 
 #if defined(hppa7100)
 
-#define RTEMS_MODEL_NAME  "hppa 7100"
+#define CPU_MODEL_NAME  "hppa 7100"
 
 #elif defined(hppa7200)
 
-#define RTEMS_MODEL_NAME  "hppa 7200"
+#define CPU_MODEL_NAME  "hppa 7200"
 
 #else
 
@@ -80,7 +80,7 @@ extern "C" {
 
 #endif
 
-#endif /* !defined(RTEMS_MODEL_NAME) */
+#endif /* !defined(CPU_MODEL_NAME) */
           
 /*
  *  Define the name of the CPU family.
diff --git a/c/src/exec/score/cpu/hppa1.1/rtems.s b/c/src/exec/score/cpu/hppa1.1/rtems.s
index e59be60201..06de39dddf 100644
--- a/c/src/exec/score/cpu/hppa1.1/rtems.s
+++ b/c/src/exec/score/cpu/hppa1.1/rtems.s
@@ -14,8 +14,8 @@
  *  $Id$
  */
 
-#include <rtems/core/hppa.h>
-#include <rtems/core/cpu_asm.h>
+#include <rtems/score/hppa.h>
+#include <rtems/score/cpu_asm.h>
 
 	.SPACE $PRIVATE$
 	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
diff --git a/c/src/exec/score/cpu/i386/asm.h b/c/src/exec/score/cpu/i386/asm.h
index aac1ba9dbe..e317161043 100644
--- a/c/src/exec/score/cpu/i386/asm.h
+++ b/c/src/exec/score/cpu/i386/asm.h
@@ -31,7 +31,7 @@
  */
 
 #define ASM
-#include <rtems/core/i386.h>
+#include <rtems/score/i386.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the
diff --git a/c/src/exec/score/cpu/i386/cpu.c b/c/src/exec/score/cpu/i386/cpu.c
index e23313a9ad..917cf042a9 100644
--- a/c/src/exec/score/cpu/i386/cpu.c
+++ b/c/src/exec/score/cpu/i386/cpu.c
@@ -14,8 +14,8 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/wkspace.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/wkspace.h>
 
 /*  _CPU_Initialize
  *
diff --git a/c/src/exec/score/cpu/i386/cpu.h b/c/src/exec/score/cpu/i386/cpu.h
index f173d0cdc7..2ac3b1970c 100644
--- a/c/src/exec/score/cpu/i386/cpu.h
+++ b/c/src/exec/score/cpu/i386/cpu.h
@@ -22,9 +22,9 @@ extern "C" {
 #endif
 
 #ifndef ASM
-#include <rtems/core/i386types.h>
+#include <rtems/score/i386types.h>
 #endif
-#include <rtems/core/i386.h>
+#include <rtems/score/i386.h>
 
 /* conditional compilation parameters */
 
diff --git a/c/src/exec/score/cpu/i386/i386.h b/c/src/exec/score/cpu/i386/i386.h
index 1832d4142e..8cb246aa91 100644
--- a/c/src/exec/score/cpu/i386/i386.h
+++ b/c/src/exec/score/cpu/i386/i386.h
@@ -65,27 +65,27 @@ extern "C" {
 
 #if defined(i386_fp)
 
-#define RTEMS_MODEL_NAME  "i386 with i387"
+#define CPU_MODEL_NAME  "i386 with i387"
 #define I386_HAS_FPU 1
 
 #elif defined(i386_nofp)
 
-#define RTEMS_MODEL_NAME  "i386 w/o i387"
+#define CPU_MODEL_NAME  "i386 w/o i387"
 #define I386_HAS_FPU 1
 
 #elif defined(i486dx)
 
-#define RTEMS_MODEL_NAME  "i486dx"
+#define CPU_MODEL_NAME  "i486dx"
 #define I386_HAS_FPU 1
 
 #elif defined(i486sx)
 
-#define RTEMS_MODEL_NAME  "i486sx"
+#define CPU_MODEL_NAME  "i486sx"
 #define I386_HAS_FPU 0
 
 #elif defined(pentium)
 
-#define RTEMS_MODEL_NAME  "Pentium"
+#define CPU_MODEL_NAME  "Pentium"
 #define I386_HAS_FPU 1
 
 #else
diff --git a/c/src/exec/score/cpu/i960/asm.h b/c/src/exec/score/cpu/i960/asm.h
index 73a8b3a641..803f42f649 100644
--- a/c/src/exec/score/cpu/i960/asm.h
+++ b/c/src/exec/score/cpu/i960/asm.h
@@ -31,7 +31,7 @@
  */
 
 #define ASM
-#include <rtems/core/i960.h>
+#include <rtems/score/i960.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the
diff --git a/c/src/exec/score/cpu/i960/cpu.c b/c/src/exec/score/cpu/i960/cpu.c
index 9be7b7e07f..e55a400c40 100644
--- a/c/src/exec/score/cpu/i960/cpu.c
+++ b/c/src/exec/score/cpu/i960/cpu.c
@@ -20,7 +20,7 @@
 #endif
 
 #include <rtems/system.h>
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 
 /*  _CPU_Initialize
  *
diff --git a/c/src/exec/score/cpu/i960/cpu.h b/c/src/exec/score/cpu/i960/cpu.h
index f1b1ad399e..4ec7547e2d 100644
--- a/c/src/exec/score/cpu/i960/cpu.h
+++ b/c/src/exec/score/cpu/i960/cpu.h
@@ -23,9 +23,9 @@ extern "C" {
 
 #pragma align 4            /* for GNU C structure alignment */
 
-#include <rtems/core/i960.h>
+#include <rtems/score/i960.h>
 #ifndef ASM
-#include <rtems/core/i960types.h>
+#include <rtems/score/i960types.h>
 #endif
 
 #define CPU_INLINE_ENABLE_DISPATCH       FALSE
diff --git a/c/src/exec/score/cpu/i960/i960.h b/c/src/exec/score/cpu/i960/i960.h
index 5112fd58c8..5c8a570736 100644
--- a/c/src/exec/score/cpu/i960/i960.h
+++ b/c/src/exec/score/cpu/i960/i960.h
@@ -56,7 +56,7 @@ extern "C" {
 
 #if defined(i960ca)
 
-#define RTEMS_MODEL_NAME  "i960ca"
+#define CPU_MODEL_NAME  "i960ca"
 #define I960_HAS_FPU 0
 
 #else
diff --git a/c/src/exec/score/cpu/m68k/asm.h b/c/src/exec/score/cpu/m68k/asm.h
index 7a25b6c298..4ce90c1b58 100644
--- a/c/src/exec/score/cpu/m68k/asm.h
+++ b/c/src/exec/score/cpu/m68k/asm.h
@@ -31,7 +31,7 @@
  */
 
 #define ASM
-#include <rtems/core/m68k.h>
+#include <rtems/score/m68k.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the
diff --git a/c/src/exec/score/cpu/m68k/cpu.c b/c/src/exec/score/cpu/m68k/cpu.c
index 4c28fbc286..f57fae6685 100644
--- a/c/src/exec/score/cpu/m68k/cpu.c
+++ b/c/src/exec/score/cpu/m68k/cpu.c
@@ -13,7 +13,7 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 
 /*  _CPU_Initialize
  *
diff --git a/c/src/exec/score/cpu/m68k/cpu.h b/c/src/exec/score/cpu/m68k/cpu.h
index c56fc3e95f..da62255987 100644
--- a/c/src/exec/score/cpu/m68k/cpu.h
+++ b/c/src/exec/score/cpu/m68k/cpu.h
@@ -30,9 +30,9 @@ extern "C" {
 
 #define NO_UNINITIALIZED_WARNINGS
 
-#include <rtems/core/m68k.h>
+#include <rtems/score/m68k.h>
 #ifndef ASM
-#include <rtems/core/m68ktypes.h>
+#include <rtems/score/m68ktypes.h>
 #endif
 
 /* conditional compilation parameters */
diff --git a/c/src/exec/score/cpu/m68k/m68k.h b/c/src/exec/score/cpu/m68k/m68k.h
index 89227b0004..706788ef70 100644
--- a/c/src/exec/score/cpu/m68k/m68k.h
+++ b/c/src/exec/score/cpu/m68k/m68k.h
@@ -78,7 +78,7 @@ extern "C" {
  
 #if defined(m68000)
  
-#define RTEMS_MODEL_NAME         "m68000"
+#define CPU_MODEL_NAME         "m68000"
 #define M68K_HAS_VBR             0
 #define M68K_HAS_SEPARATE_STACKS 0
 #define M68K_HAS_FPU             0
@@ -87,7 +87,7 @@ extern "C" {
 
 #elif defined(m68020)
  
-#define RTEMS_MODEL_NAME         "m68020"
+#define CPU_MODEL_NAME         "m68020"
 #define M68K_HAS_VBR             1
 #define M68K_HAS_SEPARATE_STACKS 1
 #define M68K_HAS_FPU             1
@@ -96,7 +96,7 @@ extern "C" {
  
 #elif defined(m68020_nofp)
  
-#define RTEMS_MODEL_NAME         "m68020 w/o fp"
+#define CPU_MODEL_NAME         "m68020 w/o fp"
 #define M68K_HAS_VBR             1
 #define M68K_HAS_SEPARATE_STACKS 1
 #define M68K_HAS_FPU             0
@@ -105,7 +105,7 @@ extern "C" {
  
 #elif defined(m68030)
  
-#define RTEMS_MODEL_NAME         "m68030"
+#define CPU_MODEL_NAME         "m68030"
 #define M68K_HAS_VBR             1
 #define M68K_HAS_SEPARATE_STACKS 1
 #define M68K_HAS_FPU             1
@@ -114,7 +114,7 @@ extern "C" {
  
 #elif defined(m68040)
 
-#define RTEMS_MODEL_NAME         "m68040"
+#define CPU_MODEL_NAME         "m68040"
 #define M68K_HAS_VBR             1
 #define M68K_HAS_SEPARATE_STACKS 1
 #define M68K_HAS_FPU             1
@@ -123,7 +123,7 @@ extern "C" {
  
 #elif defined(m68lc040)
 
-#define RTEMS_MODEL_NAME         "m68lc040"
+#define CPU_MODEL_NAME         "m68lc040"
 #define M68K_HAS_VBR             1
 #define M68K_HAS_SEPARATE_STACKS 1
 #define M68K_HAS_FPU             0
@@ -132,7 +132,7 @@ extern "C" {
  
 #elif defined(m68ec040)
 
-#define RTEMS_MODEL_NAME         "m68ec040"
+#define CPU_MODEL_NAME         "m68ec040"
 #define M68K_HAS_VBR             1
 #define M68K_HAS_SEPARATE_STACKS 1
 #define M68K_HAS_FPU             0
@@ -141,7 +141,7 @@ extern "C" {
 
 #elif defined(m68332)
  
-#define RTEMS_MODEL_NAME         "m68332"
+#define CPU_MODEL_NAME         "m68332"
 #define M68K_HAS_VBR             1
 #define M68K_HAS_SEPARATE_STACKS 0
 #define M68K_HAS_FPU             0
diff --git a/c/src/exec/score/cpu/no_cpu/asm.h b/c/src/exec/score/cpu/no_cpu/asm.h
index ca0ff95e35..66d98be652 100644
--- a/c/src/exec/score/cpu/no_cpu/asm.h
+++ b/c/src/exec/score/cpu/no_cpu/asm.h
@@ -31,7 +31,7 @@
  */
 
 #define ASM
-#include <rtems/core/no_cpu.h>
+#include <rtems/score/no_cpu.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the
diff --git a/c/src/exec/score/cpu/no_cpu/cpu.c b/c/src/exec/score/cpu/no_cpu/cpu.c
index 2745e983a4..fafed97667 100644
--- a/c/src/exec/score/cpu/no_cpu/cpu.c
+++ b/c/src/exec/score/cpu/no_cpu/cpu.c
@@ -14,8 +14,8 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/wkspace.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/wkspace.h>
 
 /*  _CPU_Initialize
  *
diff --git a/c/src/exec/score/cpu/no_cpu/cpu.h b/c/src/exec/score/cpu/no_cpu/cpu.h
index 7242ebc041..eabe7ba2a0 100644
--- a/c/src/exec/score/cpu/no_cpu/cpu.h
+++ b/c/src/exec/score/cpu/no_cpu/cpu.h
@@ -21,9 +21,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/no_cpu.h>               /* pick up machine definitions */
+#include <rtems/score/no_cpu.h>               /* pick up machine definitions */
 #ifndef ASM
-#include <rtems/core/no_cputypes.h>
+#include <rtems/score/no_cputypes.h>
 #endif
 
 /* conditional compilation parameters */
diff --git a/c/src/exec/score/cpu/no_cpu/cpu_asm.c b/c/src/exec/score/cpu/no_cpu/cpu_asm.c
index 0d7622d15f..7b87a5ffba 100644
--- a/c/src/exec/score/cpu/no_cpu/cpu_asm.c
+++ b/c/src/exec/score/cpu/no_cpu/cpu_asm.c
@@ -24,7 +24,7 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/cpu.h>
+#include <rtems/score/cpu.h>
 /* #include "cpu_asm.h> */
 
 /*
diff --git a/c/src/exec/score/cpu/no_cpu/cpu_asm.h b/c/src/exec/score/cpu/no_cpu/cpu_asm.h
index 50bc256e06..dd1d6a427d 100644
--- a/c/src/exec/score/cpu/no_cpu/cpu_asm.h
+++ b/c/src/exec/score/cpu/no_cpu/cpu_asm.h
@@ -21,7 +21,7 @@
 
 /* pull in the generated offsets */
 
-#include <rtems/core/offsets.h>
+#include <rtems/score/offsets.h>
 
 /*
  * Hardware General Registers
diff --git a/c/src/exec/score/cpu/no_cpu/no_cpu.h b/c/src/exec/score/cpu/no_cpu/no_cpu.h
index 465c45f7b0..afc3a46571 100644
--- a/c/src/exec/score/cpu/no_cpu/no_cpu.h
+++ b/c/src/exec/score/cpu/no_cpu/no_cpu.h
@@ -55,7 +55,7 @@ extern "C" {
  
 #if defined(no_cpu)
  
-#define RTEMS_MODEL_NAME  "no_cpu"
+#define CPU_MODEL_NAME  "no_cpu"
 #define NOCPU_HAS_FPU     1
  
 #else
diff --git a/c/src/exec/score/cpu/no_cpu/rtems.c b/c/src/exec/score/cpu/no_cpu/rtems.c
index 0d15381046..8499b6f01d 100644
--- a/c/src/exec/score/cpu/no_cpu/rtems.c
+++ b/c/src/exec/score/cpu/no_cpu/rtems.c
@@ -22,7 +22,7 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/cpu.h>
+#include <rtems/score/cpu.h>
 /* #include "asm.h> */
 
 /*
diff --git a/c/src/exec/score/cpu/powerpc/cpu.c b/c/src/exec/score/cpu/powerpc/cpu.c
index 0d4b94e4be..1f8c40f274 100644
--- a/c/src/exec/score/cpu/powerpc/cpu.c
+++ b/c/src/exec/score/cpu/powerpc/cpu.c
@@ -29,10 +29,10 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/context.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/wkspace.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/context.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/wkspace.h>
 
 /*
  *  These are for testing purposes.
diff --git a/c/src/exec/score/cpu/powerpc/cpu.h b/c/src/exec/score/cpu/powerpc/cpu.h
index fd44f5ee8e..7bccbce587 100644
--- a/c/src/exec/score/cpu/powerpc/cpu.h
+++ b/c/src/exec/score/cpu/powerpc/cpu.h
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#include <rtems/core/ppc.h>               /* pick up machine definitions */
+#include <rtems/score/ppc.h>               /* pick up machine definitions */
 #ifndef ASM
 struct CPU_Interrupt_frame;
 
-#include <rtems/core/ppctypes.h>
+#include <rtems/score/ppctypes.h>
 #endif
 
 /* conditional compilation parameters */
diff --git a/c/src/exec/score/cpu/powerpc/ppc.h b/c/src/exec/score/cpu/powerpc/ppc.h
index 76f3129c2e..7e9d12875c 100644
--- a/c/src/exec/score/cpu/powerpc/ppc.h
+++ b/c/src/exec/score/cpu/powerpc/ppc.h
@@ -73,7 +73,7 @@ extern "C" {
  
 #if defined(ppc403)
  
-#define RTEMS_MODEL_NAME  "PowerPC 403"
+#define CPU_MODEL_NAME  "PowerPC 403"
 
 #define PPC_ALIGNMENT		4
 #define PPC_CACHE_ALIGNMENT	16
@@ -96,7 +96,7 @@ extern "C" {
 
 #elif defined(ppc601)
  
-#define RTEMS_MODEL_NAME  "PowerPC 601"
+#define CPU_MODEL_NAME  "PowerPC 601"
 
 #define PPC_ALIGNMENT		8
 #define PPC_CACHE_ALIGNMENT	32
@@ -119,7 +119,7 @@ extern "C" {
  
 #elif defined(ppc602)
  
-#define RTEMS_MODEL_NAME  "PowerPC 602"
+#define CPU_MODEL_NAME  "PowerPC 602"
 
 #define PPC_ALIGNMENT		4
 #define PPC_CACHE_ALIGNMENT	32
@@ -137,7 +137,7 @@ extern "C" {
 
 #elif defined(ppc603)
  
-#define RTEMS_MODEL_NAME  "PowerPC 603"
+#define CPU_MODEL_NAME  "PowerPC 603"
 
 #define PPC_ALIGNMENT		8
 #define PPC_CACHE_ALIGNMENT	32
@@ -160,7 +160,7 @@ extern "C" {
 
 #elif defined(ppc603e)
  
-#define RTEMS_MODEL_NAME  "PowerPC 603e"
+#define CPU_MODEL_NAME  "PowerPC 603e"
 
 #define PPC_ALIGNMENT		8
 #define PPC_CACHE_ALIGNMENT	32
@@ -183,7 +183,7 @@ extern "C" {
 
 #elif defined(ppc604)
  
-#define RTEMS_MODEL_NAME  "PowerPC 604"
+#define CPU_MODEL_NAME  "PowerPC 604"
 
 #define PPC_ALIGNMENT		8
 #define PPC_CACHE_ALIGNMENT	32
diff --git a/c/src/exec/score/cpu/unix/cpu.c b/c/src/exec/score/cpu/unix/cpu.c
index a1994da5ae..daff56a1de 100644
--- a/c/src/exec/score/cpu/unix/cpu.c
+++ b/c/src/exec/score/cpu/unix/cpu.c
@@ -17,8 +17,8 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/interr.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/interr.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/c/src/exec/score/cpu/unix/cpu.h b/c/src/exec/score/cpu/unix/cpu.h
index 93d2b65ee2..d7ff311af1 100644
--- a/c/src/exec/score/cpu/unix/cpu.h
+++ b/c/src/exec/score/cpu/unix/cpu.h
@@ -26,9 +26,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/unix.h>
+#include <rtems/score/unix.h>
 #ifndef ASM
-#include <rtems/core/unixtypes.h>
+#include <rtems/score/unixtypes.h>
 #endif
 
 #if defined(solaris2)
diff --git a/c/src/exec/score/cpu/unix/unix.h b/c/src/exec/score/cpu/unix/unix.h
index 6acadf2879..bb5011b41b 100644
--- a/c/src/exec/score/cpu/unix/unix.h
+++ b/c/src/exec/score/cpu/unix/unix.h
@@ -64,15 +64,15 @@ extern "C" {
  
 #if defined(hpux)
  
-#define RTEMS_MODEL_NAME  "HP-UX"
+#define CPU_MODEL_NAME  "HP-UX"
  
 #elif defined(solaris)
  
-#define RTEMS_MODEL_NAME  "Solaris"
+#define CPU_MODEL_NAME  "Solaris"
  
 #elif defined(linux)
  
-#define RTEMS_MODEL_NAME  "Linux"
+#define CPU_MODEL_NAME  "Linux"
  
 #else
  
-- 
cgit v1.2.3