summaryrefslogtreecommitdiffstats
path: root/cpukit/score/cpu/m68k
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-11-19 04:40:13 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-11-19 04:40:13 +0000
commitff6042488e8c977393449e72b9ec6ac58efa3d67 (patch)
tree5e83e7e3bb81c681db9ce7e949683700d7ed2a7e /cpukit/score/cpu/m68k
parent2004-11-17 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-ff6042488e8c977393449e72b9ec6ac58efa3d67.tar.bz2
2004-11-19 Ralf Corsepius <ralf_corsepius@rtems.org>
* rtems/score/m68k.h: Use (defined(__mc68020__) && !defined(__mcpu32__)) instead of defined(__mc68020__) to reflect GCC-3.4's expectations.
Diffstat (limited to 'cpukit/score/cpu/m68k')
-rw-r--r--cpukit/score/cpu/m68k/ChangeLog7
-rw-r--r--cpukit/score/cpu/m68k/rtems/score/m68k.h2
2 files changed, 7 insertions, 2 deletions
diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index a3939b9189..52051da12d 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,4 +1,9 @@
-2004-10-02 Ralf Corsepius <ralf_corsepius@rtems.org>
+2004-11-19 Ralf Corsepius <ralf_corsepius@rtems.org>
+
+ * rtems/score/m68k.h: Use (defined(__mc68020__) && !defined(__mcpu32__))
+ instead of defined(__mc68020__) to reflect GCC-3.4's expectations.
+
+2004-11-02 Ralf Corsepius <ralf_corsepius@rtems.org>
* rtems/score/cpu.h: Add doxygen preamble.
* rtems/score/m68k.h: Add doxygen preamble.
diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/cpukit/score/cpu/m68k/rtems/score/m68k.h
index 90313f77bc..36efa26cd0 100644
--- a/cpukit/score/cpu/m68k/rtems/score/m68k.h
+++ b/cpukit/score/cpu/m68k/rtems/score/m68k.h
@@ -91,7 +91,7 @@ extern "C" {
* but less efficient CPU32 rules are used for the CPU32+.
*/
-#if defined(__mc68020__)
+#if (defined(__mc68020__) && !defined(__mcpu32__))
#define CPU_MODEL_NAME "m68020"
#define M68K_HAS_VBR 1