diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-01 19:43:29 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-07-01 19:43:29 +0000 |
commit | 9787ee22a1568ff18489b3a4d3b9084d571d9986 (patch) | |
tree | b971ff65e08b112c956cb0c6eeb976754900a749 | |
parent | 2010-07-01 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-9787ee22a1568ff18489b3a4d3b9084d571d9986.tar.bz2 |
2010-07-01 Joel Sherrill <joel.sherrill@oarcorp.com>
* rtems/asm.h, rtems/score/cpu.h: cpu.h defines were not available to
assembly programs. This resulted in percpu.h (when included from
assembly) not being able to detect that the MIPS does not have a
dedicated software managed interrupt stack.
-rw-r--r-- | cpukit/score/cpu/mips/ChangeLog | 7 | ||||
-rw-r--r-- | cpukit/score/cpu/mips/rtems/asm.h | 1 | ||||
-rw-r--r-- | cpukit/score/cpu/mips/rtems/score/cpu.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog index a6aae9c1d9..53cca28825 100644 --- a/cpukit/score/cpu/mips/ChangeLog +++ b/cpukit/score/cpu/mips/ChangeLog @@ -1,3 +1,10 @@ +2010-07-01 Joel Sherrill <joel.sherrill@oarcorp.com> + + * rtems/asm.h, rtems/score/cpu.h: cpu.h defines were not available to + assembly programs. This resulted in percpu.h (when included from + assembly) not being able to detect that the MIPS does not have a + dedicated software managed interrupt stack. + 2010-06-28 Joel Sherrill <joel.sherrill@oarcorp.com> PR 1573/cpukit diff --git a/cpukit/score/cpu/mips/rtems/asm.h b/cpukit/score/cpu/mips/rtems/asm.h index c20c663509..0ef10f8baa 100644 --- a/cpukit/score/cpu/mips/rtems/asm.h +++ b/cpukit/score/cpu/mips/rtems/asm.h @@ -36,6 +36,7 @@ #ifndef ASM #define ASM #endif +#include <rtems/system.h> #include <rtems/score/cpuopts.h> #include <rtems/score/mips.h> diff --git a/cpukit/score/cpu/mips/rtems/score/cpu.h b/cpukit/score/cpu/mips/rtems/score/cpu.h index aab4d4893d..13964ab235 100644 --- a/cpukit/score/cpu/mips/rtems/score/cpu.h +++ b/cpukit/score/cpu/mips/rtems/score/cpu.h @@ -387,7 +387,7 @@ extern "C" { * a debugger such as gdb. But that is another problem. */ -#ifndef ASSEMBLY_ONLY +#ifndef ASM /* WARNING: If this structure is modified, the constants in cpu.h must be updated. */ #if (__mips == 1) || (__mips == 32) |