* sysdeps/mach/hurd/times.c: Fix typo in last change.

	* sysdeps/mach/hurd/setpriority.c [POLICY_TIMESHARE_BASE_COUNT]:
	Use task_policy in place of task_priority.

	* sysdeps/generic/bits/mman.h
	(MS_ASYNC, MS_SYNC, MS_INVALIDATE): New macros.
	* sysdeps/mach/msync.c: New file.

	* sysdeps/mach/powerpc/syscall.S: New file.

	* mach/msg.c [MACH_MSG_OVERWRITE]
	(__mach_msg_trap, __mach_msg_overwrite): New functions.
	* mach/Versions (libc: GLIBC_2.0): Add mach_msg_overwrite and __ name.

	* sysdeps/mach/configure.in: Check for clock.defs to put into
	mach_interface_list.
	* sysdeps/mach/configure: Regenerated.

	* mach/Makefile (mach-machine): New variable, set from $(base-machine).
	($(objpfx)mach-syscalls.mk): Use it in place of $(base-machine).
	($(mach-syscalls:%=$(objpfx)%.S) static pattern rule):
	Use <mach/machine/syscall_sw.h> instead of <sysdep.h>.
	(mach-shortcuts): Add device_read_overwrite_request,
	device_read_overwrite, vm_read_overwrite, thread_switch.

	* configure.in (base_machine): Set to $machine by default.
	* configure: Regenerated.

7 files changed, 108 insertions, 5 deletions

diff --git a/sysdeps/generic/bits/mman.h b/sysdeps/generic/bits/mman.h
index f567b9b..a2ee064 100644
--- a/sysdeps/generic/bits/mman.h
+++ b/sysdeps/generic/bits/mman.h
@@ -1,5 +1,5 @@
 /* Definitions for BSD-style memory management.
-   Copyright (C) 1994-1998,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1994-1998,2000,01,02 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
@@ -80,6 +80,10 @@
 # define POSIX_MADV_DONTNEED	4 /* Don't need these pages.  */
 #endif
 
+/* Flags to `msync'.  */
+#define MS_ASYNC	1		/* Sync memory asynchronously.  */
+#define MS_SYNC		0		/* Synchronous memory sync.  */
+#define MS_INVALIDATE	2		/* Invalidate the caches.  */
 
 /* Flags for `mlockall' (can be OR'd together).  */
 #define MCL_CURRENT	1		/* Lock all currently mapped pages.  */
diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure
index 250a292..72d5bf7 100644
--- a/sysdeps/mach/configure
+++ b/sysdeps/mach/configure
@@ -165,7 +165,7 @@ fi
 
 mach_interface_list=
 for ifc in mach mach4 \
-	   clock_priv host_priv host_security ledger lock_set \
+	   clock clock_priv host_priv host_security ledger lock_set \
 	   processor processor_set task thread_act vm_map \
 	   memory_object memory_object_default default_pager \
 	   ; do
diff --git a/sysdeps/mach/configure.in b/sysdeps/mach/configure.in
index fc74e9c..541fd77 100644
--- a/sysdeps/mach/configure.in
+++ b/sysdeps/mach/configure.in
@@ -49,7 +49,7 @@ dnl environment the compile against those headers will fail.
 dnl
 mach_interface_list=
 for ifc in mach mach4 \
-	   clock_priv host_priv host_security ledger lock_set \
+	   clock clock_priv host_priv host_security ledger lock_set \
 	   processor processor_set task thread_act vm_map \
 	   memory_object memory_object_default default_pager \
 	   ; do
diff --git a/sysdeps/mach/hurd/setpriority.c b/sysdeps/mach/hurd/setpriority.c
index 3d1ce54..ab713bd 100644
--- a/sysdeps/mach/hurd/setpriority.c
+++ b/sysdeps/mach/hurd/setpriority.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1994,95,97,2000,02 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
@@ -44,7 +44,19 @@ setpriority (enum __priority_which which, id_t who, int prio)
 	{
 	  error_t prierr;
 	  ++ntasks;
+#ifdef POLICY_TIMESHARE_BASE_COUNT
+	  {
+	    /* XXX This assumes timeshare policy.  */
+	    struct policy_timeshare_base base
+	      = { NICE_TO_MACH_PRIORITY (prio) };
+	    prierr = __task_policy (task, POLICY_TIMESHARE,
+				    (policy_base_t) &base,
+				    POLICY_TIMESHARE_BASE_COUNT,
+				    0, 1);
+	  }
+#else
 	  prierr = __task_priority (task, NICE_TO_MACH_PRIORITY (prio), 1);
+#endif
 	  __mach_port_deallocate (__mach_task_self (), task);
 	  switch (prierr)
 	    {
diff --git a/sysdeps/mach/hurd/times.c b/sysdeps/mach/hurd/times.c
index 2065aac..4d537ca 100644
--- a/sysdeps/mach/hurd/times.c
+++ b/sysdeps/mach/hurd/times.c
@@ -83,7 +83,7 @@ __times (struct tms *tms)
 #if NO_CREATION_TIME
 # define our_creation_time	startup_time
 #else
-# define our_creation_time	bi.startup_time
+# define our_creation_time	bi.creation_time
 #endif
   return (clock_from_time_value (&now)
 	  - clock_from_time_value (&our_creation_time));
diff --git a/sysdeps/mach/msync.c b/sysdeps/mach/msync.c
new file mode 100644
index 0000000..cf62960
--- /dev/null
+++ b/sysdeps/mach/msync.c
@@ -0,0 +1,57 @@
+/* msync -- Synchronize mapped memory to external storage.  Mach version.
+   Copyright (C) 2002 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.  */
+
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <mach.h>
+
+/* Some Mach variants have vm_msync and some don't.  Those that have it
+   define the VM_SYNC_* bits when we include <mach/mach_types.h>.  */
+
+#ifndef VM_SYNC_SYNCHRONOUS
+# include <sysdeps/generic/msync.c>
+#else
+
+/* Synchronize the region starting at ADDR and extending LEN bytes with the
+   file it maps.  Filesystem operations on a file being mapped are
+   unpredictable before this is done.  */
+
+int
+msync (__ptr_t addr, size_t len, int flags)
+{
+  vm_sync_t sync_flags = 0;
+  kern_return_t err;
+
+  if (flags & MS_SYNC)
+    sync_flags |= VM_SYNC_SYNCHRONOUS;
+  if (flags & MS_ASYNC)
+    sync_flags |= VM_SYNC_ASYNCHRONOUS;
+  if (flags & MS_INVALIDATE)
+    sync_flags |= VM_SYNC_INVALIDATE;
+
+  if (err = __vm_msync (__mach_task_self (),
+			(vm_address_t) addr, (vm_size_t) len, sync_flags))
+    {
+      errno = err;
+      return -1;
+    }
+  return 0;
+}
+#endif
diff --git a/sysdeps/mach/powerpc/syscall.S b/sysdeps/mach/powerpc/syscall.S
new file mode 100644
index 0000000..6482f0d
--- /dev/null
+++ b/sysdeps/mach/powerpc/syscall.S
@@ -0,0 +1,30 @@
+/* Copyright (C) 2002 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.  */
+
+#include <sysdep.h>
+
+ENTRY (syscall)
+	mr   r0,r3
+	mr   r3,r4
+	mr   r4,r5
+	mr   r5,r6
+	mr   r6,r7
+	mr   r7,r8
+	sc
+	blr
+END (syscall)