diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-11-19 04:42:34 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-11-19 04:42:34 +0000 |
| commit | 0ee9cc185e501e3bc0a2eef10da202f8fc7a5a4c (patch) | |
| tree | e72be4d5654078714a2cb9aa4903d459e88be521 /c | |
| parent | 2004-11-19 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-0ee9cc185e501e3bc0a2eef10da202f8fc7a5a4c.tar.bz2 | |
2004-11-19 Ralf Corsepius <ralf_corsepius@rtems.org>
* shared/cache/cache.c, shared/cache/cache_.h:
Use (defined(__mc68020__) && !defined(__mcpu32__))
instead of defined(__mc68020__) to reflect GCC-3.4's expectations.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libcpu/m68k/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/m68k/shared/cache/cache.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libcpu/m68k/shared/cache/cache_.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/c/src/lib/libcpu/m68k/ChangeLog b/c/src/lib/libcpu/m68k/ChangeLog index 98dbe82ba0..7ff8f47a11 100644 --- a/c/src/lib/libcpu/m68k/ChangeLog +++ b/c/src/lib/libcpu/m68k/ChangeLog @@ -1,3 +1,9 @@ +2004-11-19 Ralf Corsepius <ralf_corsepius@rtems.org> + + * shared/cache/cache.c, shared/cache/cache_.h: + Use (defined(__mc68020__) && !defined(__mcpu32__)) + instead of defined(__mc68020__) to reflect GCC-3.4's expectations. + 2004-10-19 Ralf Corsepius <ralf_corsepius@rtems.org> * configure.ac: Remove RTEMS_ENABLE_BARE. diff --git a/c/src/lib/libcpu/m68k/shared/cache/cache.c b/c/src/lib/libcpu/m68k/shared/cache/cache.c index 46b1f66a62..1c53d7b7de 100644 --- a/c/src/lib/libcpu/m68k/shared/cache/cache.c +++ b/c/src/lib/libcpu/m68k/shared/cache/cache.c @@ -46,7 +46,7 @@ * management routines. If a given function has no meaning for the CPU, * it does nothing by default. */ -#if ( defined(__mc68020__) || defined(__mc68030__) ) +#if ( (defined(__mc68020__) && !defined(__mcpu32__)) || defined(__mc68030__) ) #if defined(__mc68030__) diff --git a/c/src/lib/libcpu/m68k/shared/cache/cache_.h b/c/src/lib/libcpu/m68k/shared/cache/cache_.h index a8d507a798..b4f8f4ad8d 100644 --- a/c/src/lib/libcpu/m68k/shared/cache/cache_.h +++ b/c/src/lib/libcpu/m68k/shared/cache/cache_.h @@ -5,7 +5,7 @@ #ifndef __M68K_CACHE_h #define __M68K_CACHE_h -#if defined(__mc68020__) +#if (defined(__mc68020__) && !defined(__mcpu32__)) #define M68K_INSTRUCTION_CACHE_ALIGNMENT 16 #elif defined(__mc68030__) #define M68K_INSTRUCTION_CACHE_ALIGNMENT 16 |