* sysdeps/mach/hurd/Makefile ($(link-rpcuserlibs)): Don't append

	options after $(build-module), which is no longer a single command.
	(LDFLAGS-link-rpcuserlibs): New variable to hold those options.
	(LDFLAGS-libmachuser-link.so, LDFLAGS-libhurduser-link.so): New
	variables using it.  Reported by Mark Kettenis <kettenis@gnu.org>.

2001-03-11  Roland McGrath  <roland@frob.com>

	* elf/rtld.c (dl_main): Add cast to quiet warning.
	* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
	* iconv/gconv_conf.c (__gconv_get_path): Likewise.
	(__gconv_read_conf): Likewise.
	* iconv/gconv_db.c (gen_steps): Likewise.
	(__gconv_find_transform): Likewise.
	* locale/programs/charmap-dir.c (fopen_uncompressed): Likewise.
	(fopen_uncompressed): Use const in second argument's type.

2001-03-11  Roland McGrath  <roland@frob.com>

	* sysdeps/mach/hurd/dl-sysdep.c (__writev): New function.

	* mach/mach_error.h: Fix ancient #endif syntax.
	* hurd/hurdmalloc.c: Likewise.

	* sysdeps/generic/atomicity.h (exchange_and_add, atomic_add,
	compare_and_swap): Add volatile qualifier to first arg, to bring
	these prototypes in line with all the other implementations.
	Add a #warning to remind the builder that these are not atomic.

2001-03-04  Roland McGrath  <roland@frob.com>

	* hurd/vpprintf.c (vpprintf) [USE_IN_LIBIO]: Use innermore first
	member of TEMP_F so its type is _IO_FILE * as expected.

	* hurd/fopenport.c (seekio): Conditionalize type of POS argument
	on [USE_IN_LIBIO].  Check the value for overflow, since for libio
	it might exceed off_t's range.

2001-02-25  Roland McGrath  <roland@frob.com>

	* sysdeps/mach/hurd/sysd-stdio.c (__stdio_reopen): Use prototype.
	* sysdeps/unix/bsd/getpt.c (__posix_openpt): Likewise.

	* sysdeps/mach/hurd/i386/intr-msg.h (SYSCALL_EXAMINE): Make this a
	macro instead of an inline function,
	(MSG_EXAMINE): Likewise.

	* hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS_1): Remove extraneous ##.

	* hurd/get-host.c: Include <string.h> for decls of built-ins.
	* hurd/hurdchdir.c: Likewise.
	* sysdeps/mach/hurd/i386/sigreturn.c: Likweise.
	* sysdeps/mach/hurd/opendir.c: Likewise.

	* mach/mach_init.c: Include <unistd.h> for _exit decl.

	* mach/errsystems.awk: Give output file a trailing newline.

	* mach/Machrules (MIG): Prepend CC='${CC}' to the mig command, so that
	the script will use our compiler for the cpp stage.

	With --enable-all-warnings we get a whole bunch of warnings,
	and these are just a few fixes; there are more needed to silence it.
	* mach/mach/mig_support.h (__mig_strncpy, mig_strncpy): Add extern
	decls before extern inline defns to quiet gcc warning.
	* hurd/hurd/threadvar.h (__hurd_threadvar_location_from_sp): Likewise.
	* sysdeps/mach/i386/machine-sp.h (__thread_stack_pointer): Likewise.

5 files changed, 26 insertions, 14 deletions

diff --git a/mach/Machrules b/mach/Machrules
index adf539419a..097117892d 100644
--- a/mach/Machrules
+++ b/mach/Machrules
@@ -1,6 +1,6 @@
 # Rules for MiG interfaces that want to go into the C library.
 
-# Copyright (C) 1991,92,93,94,95,96,98,99 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,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
@@ -55,6 +55,9 @@ $(objpfx)dummy.mk:
 
 MIGFLAGS = -DMACH_IPC_COMPAT=0 -DSTANDALONE -DTypeCheck=0 \
 	   $(+includes) $(migdefines) -subrprefix __
+# Putting CC in the enivronment makes the mig wrapper script
+# use the same compiler setup we are using to run cpp.
+MIG := CC='${CC}' $(MIG)
 
 .SUFFIXES: .defs	# Just to set specified_rule_matched.
 
diff --git a/mach/errsystems.awk b/mach/errsystems.awk
index c5cc5302b4..b01c1bd0eb 100644
--- a/mach/errsystems.awk
+++ b/mach/errsystems.awk
@@ -16,6 +16,6 @@ const struct error_system __mach_error_systems[err_max_system + 1] =";
 }
 END {
   print "  };";
-  printf "\n\
+  print "\n\
 const int __mach_error_system_count = errlib_count (__mach_error_systems);";
 }
diff --git a/mach/mach/mig_support.h b/mach/mach/mig_support.h
index bd01fd328f..cf296dc00d 100644
--- a/mach/mach/mig_support.h
+++ b/mach/mach/mig_support.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993,94,97,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
@@ -65,6 +65,8 @@ extern void mig_reply_setup (const mach_msg_header_t *__request,
 			     mach_msg_header_t *__reply);
 
 /* Idiocy support function.  */
+extern vm_size_t mig_strncpy (char *__dst, const char *__src, vm_size_t __len);
+extern vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t);
 extern __inline vm_size_t
 __mig_strncpy (char *__dst, const char *__src, vm_size_t __len)
 {
diff --git a/mach/mach_error.h b/mach/mach_error.h
index f88d1732e8..78f7c526ea 100644
--- a/mach/mach_error.h
+++ b/mach/mach_error.h
@@ -1,31 +1,37 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS 
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * HISTORY
  * $Log$
+ * Revision 1.4  2001/04/01 05:03:14  roland
+ * 2001-03-11  Roland McGrath  <roland@frob.com>
+ *
+ * 	* mach/mach_error.h: Fix ancient #endif syntax.
+ * 	* hurd/hurdmalloc.c: Likewise.
+ *
  * Revision 1.3  1997/03/16 17:42:25  drepper
  * (mach_error_string, mach_error, mach_error_type): Always provide
  * prototypes.
@@ -53,10 +59,10 @@
  *
  * Revision 2.2  92/01/16  00:08:10  rpd
  * 	Moved from user collection to mk collection.
- * 
+ *
  * Revision 2.2  91/03/27  15:39:13  mrt
  * 	First checkin
- * 
+ *
  */
 /*
  *	File:	mach_error.h
@@ -93,4 +99,4 @@ const char	*mach_error_type(
 	mach_error_t	error_value
 				);
 
-#endif	_MACH_ERROR_
+#endif	/* _MACH_ERROR_ */
diff --git a/mach/mach_init.c b/mach/mach_init.c
index eb8ed9b046..30f3c8459a 100644
--- a/mach/mach_init.c
+++ b/mach/mach_init.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1993, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992,93,95,97,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
@@ -19,6 +19,7 @@
 #include <mach_init.h>
 #include <mach/mach_interface.h>
 #include <mach/mig_support.h>
+#include <unistd.h>
 
 mach_port_t __mach_task_self_;
 vm_size_t __vm_page_size = 0;	/* Must be data not bss for weak alias.  */