Added include of targopts.h.

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

@@ -10,6 +10,8 @@
  *  NOTE: The spacing in the use of these macros
  *        is critical to them working as advertised.
  *
+ *  !!! THIS FILE DOES NOT APPEAR TO HAVE BEEN USED IN THE 29K PORT !!!
+ *
  *  COPYRIGHT:
  *
  *  This file is based on similar code found in newlib available
@@ -23,15 +25,16 @@
  *  $Id$
  */
 
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
+#ifndef __A29K_ASM_h
+#define __A29K_ASM_h
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
  */
 
 #define ASM
-#include <rtems/score/no_cpu.h>
+#include <rtems/score/targopts.h>
+#include <rtems/score/asm.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the

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

@@ -31,6 +31,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/i386.h>
 
 /*

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

@@ -31,6 +31,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/i960.h>
 
 /*

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

@@ -23,7 +23,7 @@ extern "C" {
 
 #pragma align 4            /* for GNU C structure alignment */
 
-#include <rtems/score/i960.h>
+#include <rtems/score/i960.h>              /* pick up machine definitions */
 #ifndef ASM
 #include <rtems/score/i960types.h>
 #endif

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

@@ -31,7 +31,8 @@
  */
 
 #define ASM
-#include <rtems/score/m68k.h>
+#include <rtems/score/targopts.h>
+#include <rtems/score/cpu.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the

c/src/exec/score/cpu/mips/asm.h

@@ -32,6 +32,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/no_cpu.h>
 
 /*

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

@@ -32,6 +32,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/no_cpu.h>
 
 /*

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

@@ -31,6 +31,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/no_cpu.h>
 
 /*

c/src/exec/score/cpu/sparc/asm.h

@@ -29,7 +29,7 @@
 
 #define ASM
 
-#include <rtems/score/sparc.h>
+#include <rtems/score/targopts.h>
 #include <rtems/score/cpu.h>
 
 /*

cpukit/score/cpu/a29k/asm.h

@@ -10,6 +10,8 @@
  *  NOTE: The spacing in the use of these macros
  *        is critical to them working as advertised.
  *
+ *  !!! THIS FILE DOES NOT APPEAR TO HAVE BEEN USED IN THE 29K PORT !!!
+ *
  *  COPYRIGHT:
  *
  *  This file is based on similar code found in newlib available
@@ -23,15 +25,16 @@
  *  $Id$
  */
 
-#ifndef __NO_CPU_ASM_h
-#define __NO_CPU_ASM_h
+#ifndef __A29K_ASM_h
+#define __A29K_ASM_h
 
 /*
  *  Indicate we are in an assembly file and get the basic CPU definitions.
  */
 
 #define ASM
-#include <rtems/score/no_cpu.h>
+#include <rtems/score/targopts.h>
+#include <rtems/score/asm.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the

cpukit/score/cpu/i386/asm.h

@@ -31,6 +31,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/i386.h>
 
 /*

cpukit/score/cpu/i386/rtems/asm.h

@@ -31,6 +31,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/i386.h>
 
 /*

cpukit/score/cpu/i960/asm.h

@@ -31,6 +31,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/i960.h>
 
 /*

cpukit/score/cpu/m68k/asm.h

@@ -31,7 +31,8 @@
  */
 
 #define ASM
-#include <rtems/score/m68k.h>
+#include <rtems/score/targopts.h>
+#include <rtems/score/cpu.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the

cpukit/score/cpu/m68k/rtems/asm.h

@@ -31,7 +31,8 @@
  */
 
 #define ASM
-#include <rtems/score/m68k.h>
+#include <rtems/score/targopts.h>
+#include <rtems/score/cpu.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the

cpukit/score/cpu/mips/asm.h

@@ -32,6 +32,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/no_cpu.h>
 
 /*

cpukit/score/cpu/mips/rtems/asm.h

@@ -32,6 +32,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/no_cpu.h>
 
 /*

cpukit/score/cpu/mips64orion/asm.h

@@ -32,6 +32,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/no_cpu.h>
 
 /*

cpukit/score/cpu/no_cpu/asm.h

@@ -31,6 +31,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/no_cpu.h>
 
 /*

cpukit/score/cpu/no_cpu/rtems/asm.h

@@ -31,6 +31,7 @@
  */
 
 #define ASM
+#include <rtems/score/targopts.h>
 #include <rtems/score/no_cpu.h>
 
 /*

cpukit/score/cpu/sparc/asm.h

@@ -29,7 +29,7 @@
 
 #define ASM
 
-#include <rtems/score/sparc.h>
+#include <rtems/score/targopts.h>
 #include <rtems/score/cpu.h>
 
 /*

cpukit/score/cpu/sparc/rtems/asm.h

@@ -29,7 +29,7 @@
 
 #define ASM
 
-#include <rtems/score/sparc.h>
+#include <rtems/score/targopts.h>
 #include <rtems/score/cpu.h>
 
 /*