m68k.h (MACHINE_STATE_SAVE, [...]): Add __HPUX_ASM__ versions.

        * m68k/m68k.h (MACHINE_STATE_SAVE, MACHINE_STATE_RESTORE): Add
        __HPUX_ASM__ versions.
Fixes build problems for m68k-hp-hpux*

From-SVN: r15102

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4becb8c495bd57e5b6c120335f581263c9a376cb..bfb637e5abfff3342d7bd25584108cad8d96d409 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep  5 09:37:50 1997  Jim Wilson  (wilson@cygnus.com)
+
+       * m68k/m68k.h (MACHINE_STATE_SAVE, MACHINE_STATE_RESTORE): Add
+       __HPUX_ASM__ versions.
+
 Fri Sep  5 09:08:44 1997  Jeffrey A Law  (law@cygnus.com)
 
         * install.sh: Delete duplicate install script.

diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index 5e4dac7573515321f8d3034b7db399f61c60e740..1f5f92155c97ac6bbed1a13966e6fc87168f8de8 100644 (file)
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -1052,11 +1052,20 @@ while(0)
     }
 #else /* !__mcf5200__ */
 #if defined(MACHINE_STATE_m68010_up)
+#ifdef __HPUX_ASM__
+/* HPUX assembler does not accept %ccr.  */
+#define MACHINE_STATE_SAVE(id)         \
+    {                                  \
+      asm ("move.w %cc,-(%sp)");       \
+      asm ("movm.l &0xc0c0,-(%sp)");   \
+    }
+#else /* ! __HPUX_ASM__ */
 #define MACHINE_STATE_SAVE(id)         \
     {                                  \
       asm ("move.w %ccr,-(%sp)");      \
       asm ("movm.l &0xc0c0,-(%sp)");   \
     }
+#endif /* __HPUX_ASM__ */
 #else /* !MACHINE_STATE_m68010_up */
 #define MACHINE_STATE_SAVE(id)         \
     {                                  \
@@ -1103,11 +1112,20 @@ while(0)
       asm ("add.l 20,%sp");            \
     }
 #else /* !__mcf5200__ */
+#ifdef __HPUX_ASM__
+/* HPUX assembler does not accept %ccr.  */
+#define MACHINE_STATE_RESTORE(id)      \
+    {                                  \
+      asm ("movm.l (%sp)+,&0x0303");   \
+      asm ("move.w (%sp)+,%cc");       \
+    }
+#else /* ! __HPUX_ASM__ */
 #define MACHINE_STATE_RESTORE(id)      \
     {                                  \
       asm ("movm.l (%sp)+,&0x0303");   \
       asm ("move.w (%sp)+,%ccr");      \
     }
+#endif /* __HPUX_ASM__ */
 #endif /* __mcf5200__ */
 #else /* !MOTOROLA */
 #if defined(__mcf5200__)