aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey A Law <law@cygnus.com>1998-03-15 22:14:44 +0000
committerJeff Law <law@gcc.gnu.org>1998-03-15 15:14:44 -0700
commitecfe148ef97f55b5d202a78e66370cb6b01afe91 (patch)
tree92064048cb7853888ee5b2dcb493b38b3346fe37
parent75f71db751a8ffb3619cfa8f24013e3a8ce8d506 (diff)
downloadgcc-ecfe148ef97f55b5d202a78e66370cb6b01afe91.zip
gcc-ecfe148ef97f55b5d202a78e66370cb6b01afe91.tar.gz
gcc-ecfe148ef97f55b5d202a78e66370cb6b01afe91.tar.bz2
* m68k.h: Fix mis-applied fix from the mainline branch.
From-SVN: r18608
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/m68k/m68k.h9
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 869bca2..56d78d3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,8 @@
-Wed Mar 11 14:26:52 1998 Jeffrey A Law (law@cygnus.com)
+Sun Mar 15 23:17:30 1998 Jeffrey A Law (law@cygnus.com)
+
+ * m68k.h: Fix mis-applied fix from the mainline branch.
+
+Wed Mar 10 14:26:52 1998 Jeffrey A Law (law@cygnus.com)
* rtlanal.c (optimize): Declare.
diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index 6004aaa..ac627dc 100644
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -165,17 +165,18 @@ extern int target_flags;
{ "68060", - (MASK_5200|MASK_68040)}, \
{ "68060", (MASK_68020|MASK_68881|MASK_BITFIELD \
|MASK_68040_ONLY|MASK_68060)}, \
- { "5200", - (MASK_68060|MASK_68040|MASK_68020|MASK_BITFIELD|MASK_68881)}, \
+ { "5200", - (MASK_68060|MASK_68040|MASK_68020|MASK_BITFIELD \
+ |MASK_68881)}, \
{ "5200", (MASK_5200)}, \
{ "68851", 0}, \
{ "no-68851", 0}, \
{ "68302", - (MASK_5200|MASK_68060|MASK_68040|MASK_68040_ONLY \
|MASK_68020|MASK_BITFIELD|MASK_68881)}, \
{ "68332", - (MASK_5200|MASK_68060|MASK_68040|MASK_68040_ONLY \
- |MASK_BITFIELD)}, \
+ |MASK_BITFIELD|MASK_68881)}, \
{ "68332", MASK_68020}, \
{ "cpu32", - (MASK_5200|MASK_68060|MASK_68040|MASK_68040_ONLY \
- |MASK_BITFIELD)}, \
+ |MASK_BITFIELD|MASK_68881)}, \
{ "cpu32", MASK_68020}, \
{ "align-int", MASK_ALIGN_INT }, \
{ "no-align-int", -MASK_ALIGN_INT }, \
@@ -1040,7 +1041,7 @@ while(0)
|| defined(__mc68020__) || defined(mc68020) \
|| defined(__mc68030__) || defined(mc68030) \
|| defined(__mc68040__) || defined(mc68040) \
- || defined(__mc68332__) || defined(mc68332)
+ || defined(__mcpu32__) || defined(mcpu32)
#define MACHINE_STATE_m68010_up
#endif