entered into RCS

diff --git a/sysdeps/m68k/__longjmp.c b/sysdeps/m68k/__longjmp.c
index cff37bc..3133e70 100644 (file)
--- a/sysdeps/m68k/__longjmp.c
+++ b/sysdeps/m68k/__longjmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -47,8 +47,12 @@ DEFUN(__longjmp, (env, val), CONST jmp_buf env AND int val)
   asm volatile(/* Restore the data and address registers.  */
               "movem%.l %0, d1-d7/a0-a7\n"
               /* Return to setjmp's caller.  */
-              "jmp a0@" :
-              /* No outputs.  */ : "g" (env[0].__dregs[0])
+#ifdef __motorola__
+              "jmp (a0)"
+#else
+              "jmp a0@"
+#endif
+              : /* No outputs.  */ : "g" (env[0].__dregs[0])
               /* We don't bother with the clobbers,
                  because this code always jumps out anyway.  */
               );

diff --git a/sysdeps/unix/bsd/m68k/pipe.S b/sysdeps/unix/bsd/m68k/pipe.S
index 4dcf931..547b4f3 100644 (file)
--- a/sysdeps/unix/bsd/m68k/pipe.S
+++ b/sysdeps/unix/bsd/m68k/pipe.S
@@ -19,7 +19,12 @@ Cambridge, MA 02139, USA.  */
 #include <sysdep.h>
 
 SYSCALL__ (pipe, 1)
+#ifdef __motorola__
+       move.l 4(sp), a0
+       movem.l d0-d1, (a0)
+#else
        movel sp@(4), a0
        moveml d0-d1, a0@
+#endif
        clrl d0
        rts

diff --git a/sysdeps/unix/bsd/m68k/wait.S b/sysdeps/unix/bsd/m68k/wait.S
index 2d4b1b6..927fa33 100644 (file)
--- a/sysdeps/unix/bsd/m68k/wait.S
+++ b/sysdeps/unix/bsd/m68k/wait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -19,8 +19,15 @@ Cambridge, MA 02139, USA.  */
 #include <sysdep.h>
 
 SYSCALL__ (wait, 1)
+#ifdef __motorola__
+       tst.l 4(sp)
+       beq 1f
+       movea.l 4(sp), a0
+       move.l d1, (a0)
+#else
        tstl sp@(4)
        beq 1f
        moveal sp@(4), a0
        movel d1, a0@
+#endif
 1:     rts