Changeset 46ce08d in rtems

Timestamp:

Nov 19, 2004, 4:44:55 AM (16 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

f10a999

Parents:

0ee9cc1

Message:

2004-11-19 Ralf Corsepius <ralf_corsepius@…>

• startup/m68k-stub.c: Use (defined(mc68020) && !defined(mcpu32)) instead of defined(mc68020) to reflect GCC-3.4's expectations.

Location:

c/src/lib/libbsp/m68k/ods68302

Files:

• ChangeLog (modified) (1 diff)
• startup/m68k-stub.c (modified) (5 diffs)

c/src/lib/libbsp/m68k/ods68302/ChangeLog

@@ +1 @@
+2004-11-19      Ralf Corsepius <ralf_corsepius@rtems.org>
+
+        * startup/m68k-stub.c: Use (defined(__mc68020__) && !defined(__mcpu32__))
+        instead of defined(__mc68020__) to reflect GCC-3.4's expectations.
+
 2004-09-24      Ralf Corsepius <ralf_corsepius@rtems.org>
 

c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c

@@ -213 +213 @@
 static ExceptionHook oldExceptionHook;
 
-#if defined(__mc68020__)
+#if (defined(__mc68020__) && !defined(__mcpu32__))
 /* the size of the exception stack on the 68020 varies with the type of
  * exception.  The following table is the number of WORDS used
@@ -315 +315 @@
 ");
 
-#if defined(__mc68020__) || defined(__mc68332__)
+#if (defined(__mc68020__) && !defined(__mcpu32__)) || defined(__mc68332__)
 asm("\n\
         movew   %sp@(2),%d0\n\
@@ -333 +333 @@
               movew   %sp@+,%d0\n\
 ");
-#if defined (__mc68000__) && !defined(__mc68020__)
+#if defined (__mc68000__) && !(defined(__mc68020__) && !defined(__mcpu32__))
 asm("\n\
         lea     %sp@(4),%sp");       /* pull off 68000 return address */
@@ -343 +343 @@
 extern void _catchException(void);
 
-#if defined(__mc68020__) || defined(__mc68332__)
+#if (defined(__mc68020__) && !defined(__mcpu32__)) || defined(__mc68332__)
 /* This function is called when a 68020 exception occurs.  It saves
  * all the cpu and fpcp regs in the _registers array, creates a frame on a
@@ -552 +552 @@
   }
 
-#if defined(__mc68000__) && !defined(__mc68020__)
+#if defined(__mc68000__) && !(defined(__mc68020__) && !defined(__mcpu32__))
   /* a 68000 cannot use the internal info pushed onto a bus error
    * or address error frame when doing an RTE so don't put this info