Update.

1999-05-02  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* sunrpc/Makefile: Generate dependencies for all flavors of
	librpcsvc objects.
	(rpcgen-cmd): Pass -Y flag here and remove it from the macro
	invocations.

1999-05-02  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* elf/dlopenold.c: Move #if down after includes to get
	dependencies right.

1999-05-01  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* sysdeps/generic/bzero.c: Undefine __bzero.

5 files changed, 39 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index e1c2dcbccf..6f97564070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+1999-05-02  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* sunrpc/Makefile: Generate dependencies for all flavors of
+	librpcsvc objects.
+	(rpcgen-cmd): Pass -Y flag here and remove it from the macro
+	invocations.
+
+1999-05-02  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* elf/dlopenold.c: Move #if down after includes to get
+	dependencies right.
+
+1999-05-01  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* sysdeps/generic/bzero.c: Undefine __bzero.
+
 1999-05-02  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/unix/sysv/linux/netax25/ax25.h: Update from kernel header.
diff --git a/elf/dlopenold.c b/elf/dlopenold.c
index 49fce7a545..7e7b462e1a 100644
--- a/elf/dlopenold.c
+++ b/elf/dlopenold.c
@@ -1,5 +1,5 @@
 /* Load a shared object at run time.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 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
@@ -17,14 +17,14 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* This file is for compatibility with glibc 2.0.  Compile it only if
-   versioning is used.  */
-#if defined PIC && DO_VERSIONING
-
 #include <dlfcn.h>
 #include <stddef.h>
 #include <elf/ldsodefs.h>
 
+/* This file is for compatibility with glibc 2.0.  Compile it only if
+   versioning is used.  */
+#if defined PIC && DO_VERSIONING
+
 struct dlopen_args
 {
   /* The arguments for dlopen_doit.  */
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index a661084014..1ce03d7d98 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -123,9 +123,9 @@ $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
   $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
 	$(+link)
 
-# Tell rpcgen that it should unset LD_LIBRARY_PATH before executing the
-# preprocessor.
-rpcgen-cmd = $(built-program-cmd)
+# Tell rpcgen where to find the C preprocessor.
+rpcgen-cmd = $(built-program-cmd) -Y `$(CC) -print-file-name=cpp | \
+				      sed "s|/cpp$$||"`
 
 # Install the rpc data base file.
 $(inst_sysconfdir)/rpc: etc.rpc $(+force)
@@ -139,8 +139,7 @@ $(rpcsvc:%.x=$(objpfx)rpcsvc/%.h): $(objpfx)rpcsvc/%.h: $(objpfx)rpcsvc/%.stmp
 $(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(objpfx)rpcgen
 	$(make-target-directory)
 	-@rm -f ${@:stmp=T} $@
-	$(rpcgen-cmd) -Y `$(CC) -print-file-name=cpp | sed "s|/cpp$$||"` \
-		      -h $< -o ${@:stmp=T}
+	$(rpcgen-cmd) -h $< -o ${@:stmp=T}
 	$(move-if-change) $(@:stmp=T) $(@:stmp=h)
 	touch $@
 
@@ -149,16 +148,19 @@ $(rpcsvc:%.x=$(objpfx)x%.c): $(objpfx)x%.c: $(objpfx)x%.stmp
 	@:
 $(objpfx)x%.stmp: rpcsvc/%.x $(objpfx)rpcgen
 	-@rm -f ${@:stmp=T} $@
-	$(rpcgen-cmd) -Y `$(CC) -print-file-name=cpp | sed "s|/cpp$$||"` \
-		      -c $< -o ${@:stmp=T}
+	$(rpcgen-cmd) -c $< -o ${@:stmp=T}
 	$(move-if-change) $(@:stmp=T) $(@:stmp=c)
 	touch $@
 
 # The generated source files depend on the corresponding generated headers.
 # Gratuitous dependency on generated .c file here just gets it mentioned to
 # avoid being an intermediate file and getting removed.
-$(rpcsvc:%.x=$(objpfx)x%.o): $(objpfx)x%.o: $(objpfx)x%.c $(objpfx)rpcsvc/%.h \
+define o-iterator-doit
+$(rpcsvc:%.x=$(objpfx)x%$o): $(objpfx)x%$o: $(objpfx)x%.c $(objpfx)rpcsvc/%.h \
 					    $(objpfx)rpc-proto.d
+endef
+object-suffixes-left = $(filter-out $(librpcsvc-inhibit-o),$(object-suffixes))
+include $(o-iterator)
 
 ifndef no_deps
 -include $(objpfx)rpc-proto.d
diff --git a/sysdeps/generic/bzero.c b/sysdeps/generic/bzero.c
index 002af2f0a3..229fcd365f 100644
--- a/sysdeps/generic/bzero.c
+++ b/sysdeps/generic/bzero.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Torbjorn Granlund (tege@sics.se).
 
@@ -20,6 +20,8 @@
 #include <string.h>
 #include <memcopy.h>
 
+#undef __bzero
+
 /* Set N bytes of S to 0.  */
 void
 __bzero (s, len)
diff --git a/sysdeps/unix/sysv/linux/netrose/rose.h b/sysdeps/unix/sysv/linux/netrose/rose.h
index 1c7d5d5a1f..1e93b6b4d3 100644
--- a/sysdeps/unix/sysv/linux/netrose/rose.h
+++ b/sysdeps/unix/sysv/linux/netrose/rose.h
@@ -1,5 +1,5 @@
 /* Definitions for Rose packet radio address family.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -31,6 +31,8 @@
    requires ax25.h for the definition of the ax25_address structure.  */
 #define ROSE_MTU	251
 
+#define ROSE_MAX_DIGIS	6
+
 #define	ROSE_DEFER	1
 #define	ROSE_T1		2
 #define	ROSE_T2		3
@@ -74,7 +76,7 @@ struct sockaddr_rose
   ax25_address	srose_digi;
 };
 
-struct full_sockaddr_rose 
+struct full_sockaddr_rose
 {
   sa_family_t srose_family;
   rose_address srose_addr;
@@ -99,7 +101,7 @@ struct rose_cause_struct
   unsigned char	diagnostic;
 };
 
-struct rose_facilities_struct 
+struct rose_facilities_struct
 {
   rose_address source_addr,   dest_addr;
   ax25_address source_call,   dest_call;