From 94690433ea406b78f0ec5f05e87cf4b6415025f9 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 10 Aug 2006 21:56:54 +0000 Subject: 2006-08-10 Joel Sherrill * cpu.c, rtems/score/sh.h: Recognize sh2e variant so multilibs will all compile. --- cpukit/score/cpu/sh/ChangeLog | 5 +++++ cpukit/score/cpu/sh/cpu.c | 2 +- cpukit/score/cpu/sh/rtems/score/sh.h | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'cpukit') diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog index 2f04171755..e5224b9ed8 100644 --- a/cpukit/score/cpu/sh/ChangeLog +++ b/cpukit/score/cpu/sh/ChangeLog @@ -1,3 +1,8 @@ +2006-08-10 Joel Sherrill + + * cpu.c, rtems/score/sh.h: Recognize sh2e variant so multilibs will all + compile. + 2006-01-16 Joel Sherrill * rtems/score/cpu.h: Part of a large patch to improve Doxygen output. diff --git a/cpukit/score/cpu/sh/cpu.c b/cpukit/score/cpu/sh/cpu.c index aa646946e6..3ed3131199 100644 --- a/cpukit/score/cpu/sh/cpu.c +++ b/cpukit/score/cpu/sh/cpu.c @@ -238,7 +238,7 @@ void _CPU_Context_Initialize( int _is_fp ) { _the_context->r15 = (uint32_t *) ((uint32_t ) (_stack_base) + (_size) ); -#if defined(__sh1__) || defined(__sh2__) +#if defined(__sh1__) || defined(__sh2__) || defined(__SH2E__) _the_context->sr = (_isr << 4) & 0x00f0 ; #else _the_context->sr = SH4_SR_MD | ((_isr << 4) & 0x00f0); diff --git a/cpukit/score/cpu/sh/rtems/score/sh.h b/cpukit/score/cpu/sh/rtems/score/sh.h index 98ddcf6997..b19855abe1 100644 --- a/cpukit/score/cpu/sh/rtems/score/sh.h +++ b/cpukit/score/cpu/sh/rtems/score/sh.h @@ -46,7 +46,8 @@ extern "C" { * predefines. */ -#if defined(__SH3E__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__) +#if defined(__SH2E__) || defined(__SH3E__) || \ + defined(__SH4__) || defined(__SH4_SINGLE_ONLY__) /* * Define this if you want to use XD-registers. @@ -63,7 +64,7 @@ extern "C" { #define SH_HAS_FPU 0 #endif -#elif defined(__sh1__) || defined(__sh2__) || defined(__sh3__) +#elif defined(__sh1__) || defined(__sh2__) || defined(__sh3__) #define SH_HAS_FPU 0 #else #warning Cannot detect FPU support, assuming no FPU -- cgit v1.2.3