Support for Mach/PowerPC contributed by Peter Bruin <pjbruin@dds.nl>.

	* sysdeps/mach/powerpc/machine-sp.h: New file.
	* sysdeps/mach/powerpc/sysdep.h: New file.
	* sysdeps/mach/powerpc/thread_state.h: New file.

	* sysdeps/mach/hurd/i386/Makefile: File removed; crt0.o rules moved ...
	* sysdeps/mach/hurd/Makefile: ... to here.  For the time being, we can
	expect to need the same thing on every platform.

	* sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: File moved ...
	* sysdeps/generic/sys/ucontext.h: ... to replace this one.

8 files changed, 177 insertions, 52 deletions

diff --git a/ChangeLog b/ChangeLog
index af6b6eec09..cbabb96e86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2001-10-28  Roland McGrath  <roland@frob.com>
 
+	Support for Mach/PowerPC contributed by Peter Bruin <pjbruin@dds.nl>.
+	* sysdeps/mach/powerpc/machine-sp.h: New file.
+	* sysdeps/mach/powerpc/sysdep.h: New file.
+	* sysdeps/mach/powerpc/thread_state.h: New file.
+
+	* sysdeps/mach/hurd/i386/Makefile: File removed; crt0.o rules moved ...
+	* sysdeps/mach/hurd/Makefile: ... to here.  For the time being, we can
+	expect to need the same thing on every platform.
+
+	* sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: File moved ...
+	* sysdeps/generic/sys/ucontext.h: ... to replace this one.
+
 	* sysdeps/unix/sysv/linux/powerpc/sysdep.h (ALIGNARG,
 	ASM_TYPE_DIRECTIVE, ASM_SIZE_DIRECTIVE, CALL_MCOUNT, ENTRY, EALIGN,
 	DO_CALL, JUMPTARGET, PSEUDO, PSEUDO_RET, PSEUDO_END, L, C_TEXT):
diff --git a/sysdeps/generic/sys/ucontext.h b/sysdeps/generic/sys/ucontext.h
index e3c4acef1f..d643dfbfc7 100644
--- a/sysdeps/generic/sys/ucontext.h
+++ b/sysdeps/generic/sys/ucontext.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Data structures for user-level context switching.  Generic version.
+   Copyright (C) 1997,98,99,2001 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
@@ -16,9 +17,29 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+/* This file's definitions suffice for any platform where all
+   the machine-specific state is described in `struct sigcontext'.  */
+
 #ifndef _SYS_UCONTEXT_H
 #define _SYS_UCONTEXT_H	1
 
-#error "No system dependent context structure definitions"
+#include <features.h>
+#include <signal.h>
+
+/* We need the signal context definitions even if they are not used
+   included in <signal.h>.  */
+#include <bits/sigcontext.h>
+
+typedef struct sigcontext mcontext_t;
+
+/* Userlevel context.  */
+typedef struct ucontext
+  {
+    unsigned long int uc_flags;
+    struct ucontext *uc_link;
+    stack_t uc_stack;
+    mcontext_t uc_mcontext;
+    __sigset_t uc_sigmask;
+  } ucontext_t;
 
 #endif /* sys/ucontext.h */
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index 586ca4a20c..f34a577c49 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -184,6 +184,16 @@ link-libc-static := $(link-libc) -Wl,-\( \
 endif
 endif
 
+ifeq ($(subdir),csu)
+
+extra-objs += static-start.o
+
+# We need special startup code for statically linked binaries.
+$(objpfx)crt0.o: $(objpfx)static-start.o $(objpfx)abi-note.o $(objpfx)init.o
+	$(link-relocatable)
+
+endif
+
 ifeq (hurd, $(subdir))
 sysdep_routines += cthreads
 endif
diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
deleted file mode 100644
index b3c619a13d..0000000000
--- a/sysdeps/mach/hurd/i386/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-ifeq ($(subdir),csu)
-
-extra-objs += static-start.o
-
-# We need special startup code for statically linked binaries.
-$(objpfx)crt0.o: $(objpfx)static-start.o $(objpfx)abi-note.o $(objpfx)init.o
-	$(link-relocatable)
-
-endif
diff --git a/sysdeps/mach/powerpc/machine-sp.h b/sysdeps/mach/powerpc/machine-sp.h
new file mode 100644
index 0000000000..949ccf1189
--- /dev/null
+++ b/sysdeps/mach/powerpc/machine-sp.h
@@ -0,0 +1,42 @@
+/* Machine-specific function to return the stack pointer.  PowerPC version.
+   Copyright (C) 2001 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _MACHINE_SP_H
+#define _MACHINE_SP_H
+
+/* Return the current stack pointer.  */
+
+#ifndef _EXTERN_INLINE
+/* Make sure this function is included in hurd/threadvar-inlines.c.  */
+# ifdef _HURD_THREADVAR_H_EXTERN_INLINE
+#  define _EXTERN_INLINE _HURD_THREADVAR_H_EXTERN_INLINE
+# else
+#  define _EXTERN_INLINE extern __inline
+# endif
+#endif
+
+_EXTERN_INLINE void *
+__thread_stack_pointer (void)
+{
+  register void *__sp__;
+  __asm__ ("mr %0, 1" : "=r" (__sp__));
+  return __sp__;
+}
+
+#endif	/* machine-sp.h */
diff --git a/sysdeps/mach/powerpc/sysdep.h b/sysdeps/mach/powerpc/sysdep.h
new file mode 100644
index 0000000000..bd56c196da
--- /dev/null
+++ b/sysdeps/mach/powerpc/sysdep.h
@@ -0,0 +1,51 @@
+/* system call details for Mach on PowerPC
+   Copyright (C) 2001 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _MACH_POWERPC_SYSDEP_H
+#define _MACH_POWERPC_SYSDEP_H
+
+#define START_ARGS char **sparg
+#define SNARF_ARGS(argc, argv, envp) \
+  do {                               \
+    argv = &sparg[1];                \
+    argc = *(int *)sparg;            \
+    envp = &argv[argc + 1];          \
+  } while (0)
+
+#define CALL_WITH_SP(fn, sp) \
+  do {                                                 \
+    register long __sp = (long) sp, __fn = (long) fn; \
+    asm volatile ("mr 1, %0; mtlr %1; blr"            \
+		  : : "r" (__sp), "r" (__fn));        \
+  } while (0)
+
+#define STACK_GROWTH_DOWN
+
+#define RETURN_TO(sp, pc, retval) \
+     asm volatile ("mr 1, %0; mtctr %1; mr 3, %2; bctr" \
+		   : : "r" (sp), "r" (pc), "r" (retval))
+
+/* Get the machine-independent Mach definitions.  */
+#include <sysdeps/mach/sysdep.h>
+
+#undef ENTRY
+#include <sysdeps/unix/sysdep.h>
+#include <sysdeps/powerpc/elf/sysdep.h>
+
+#endif  /* _MACH_POWERPC_SYSDEP_H */
diff --git a/sysdeps/mach/powerpc/thread_state.h b/sysdeps/mach/powerpc/thread_state.h
new file mode 100644
index 0000000000..883135189f
--- /dev/null
+++ b/sysdeps/mach/powerpc/thread_state.h
@@ -0,0 +1,39 @@
+/* Mach thread state definitions for machine-independent code.  PowerPC version
+   Copyright (C) 2001 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <mach/machine/thread_status.h>
+
+#define MACHINE_THREAD_STATE_FLAVOR	PPC_THREAD_STATE
+#define MACHINE_THREAD_STATE_COUNT	PPC_THREAD_STATE_COUNT
+
+#define machine_thread_state ppc_thread_state
+
+#define PC srr0
+#define SP r1
+#define SYSRETURN r3
+
+struct machine_thread_all_state
+  {
+    int set;			/* Mask of bits (1 << FLAVOR).  */
+    struct ppc_thread_state basic;
+    struct ppc_exception_state exc;
+    struct ppc_float_state fpu;
+  };
+
+#include <sysdeps/mach/thread_state.h>
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h b/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
deleted file mode 100644
index 07f0933ff6..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (C) 1997, 1998, 1999 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _SYS_UCONTEXT_H
-#define _SYS_UCONTEXT_H	1
-
-#include <features.h>
-#include <signal.h>
-
-/* We need the signal context definitions even if they are not used
-   included in <signal.h>.  */
-#include <bits/sigcontext.h>
-
-typedef struct sigcontext mcontext_t;
-
-/* Userlevel context.  */
-typedef struct ucontext
-  {
-    unsigned long int uc_flags;
-    struct ucontext *uc_link;
-    stack_t uc_stack;
-    mcontext_t uc_mcontext;
-    __sigset_t uc_sigmask;
-  } ucontext_t;
-
-#endif /* sys/ucontext.h */