Update.

1999-01-04  Ulrich Drepper  <drepper@cygnus.com>

	* catgets/gencat.c: Update year in copyright message text.
	* db2/makedb.c: Likewise.
	* debug/catchsegv.sh: Likewise.
	* elf/ldd.bash.in: Likewise.
	* iconv/iconv_prog.c: Likewise.
	* locale/programs/locale.c: Likewise.
	* locale/programs/localedef.c: Likewise.
	* malloc/mtrace.pl: Likewise.
	* nscd/nscd.c: Likewise.

1999-01-02  Philip Blundell  <philb@gnu.org>

	* sunrpc/Makefile: Ensure that we really use the right path for cpp.

1999-01-03  Philip Blundell  <philb@gnu.org>

	* Makefile (tests-clean): New test output files.
	* Makerules (do-tests-clean): New rule to support the above.
	* Rules (subdir_testclean): Likewise.

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

	* iconv/Makefile: Use install-others instead of explicit
	dependency on subdir_install.

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

	* iconv/gconv_db.c (find_derivation): Release lock before
	returning.
	(__gconv_find_transform): Likewise.

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

	* inet/ether_ntoa.c (ether_ntoa): Make `asc' static since that's
	what we return.

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

	* Makerules: Remove all references to obsolete variables
	tests-static and test-srcs-static.
	* Make-dist: Likewise.
	* Rules: Likewise.  Remove rules to generate obsolete
	empty.{c,o*}.

1999-01-03  Philip Blundell  <philb@gnu.org>

	* sysdeps/unix/sysv/linux/arm/pread.c: Use the i386 implementation.
	* sysdeps/unix/sysv/linux/arm/pread64.c: Likewise.
	* sysdeps/unix/sysv/linux/arm/pwrite.c: Likewise.
	* sysdeps/unix/sysv/linux/arm/pwrite64.c: Likewise.

21 files changed, 120 insertions, 82 deletions

diff --git a/ChangeLog b/ChangeLog
index 766e732399..90fe89f926 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+1999-01-04  Ulrich Drepper  <drepper@cygnus.com>
+
+	* catgets/gencat.c: Update year in copyright message text.
+	* db2/makedb.c: Likewise.
+	* debug/catchsegv.sh: Likewise.
+	* elf/ldd.bash.in: Likewise.
+	* iconv/iconv_prog.c: Likewise.
+	* locale/programs/locale.c: Likewise.
+	* locale/programs/localedef.c: Likewise.
+	* malloc/mtrace.pl: Likewise.
+	* nscd/nscd.c: Likewise.
+
+1999-01-02  Philip Blundell  <philb@gnu.org>
+
+	* sunrpc/Makefile: Ensure that we really use the right path for cpp.
+
+1999-01-03  Philip Blundell  <philb@gnu.org>
+
+	* Makefile (tests-clean): New test output files.
+	* Makerules (do-tests-clean): New rule to support the above.
+	* Rules (subdir_testclean): Likewise.
+
+1999-01-03  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* iconv/Makefile: Use install-others instead of explicit
+	dependency on subdir_install.
+
+1999-01-02  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* iconv/gconv_db.c (find_derivation): Release lock before
+	returning.
+	(__gconv_find_transform): Likewise.
+
+1999-01-01  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* inet/ether_ntoa.c (ether_ntoa): Make `asc' static since that's
+	what we return.
+
+1999-01-01  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* Makerules: Remove all references to obsolete variables
+	tests-static and test-srcs-static.
+	* Make-dist: Likewise.
+	* Rules: Likewise.  Remove rules to generate obsolete
+	empty.{c,o*}.
+
+1999-01-03  Philip Blundell  <philb@gnu.org>
+
+	* sysdeps/unix/sysv/linux/arm/pread.c: Use the i386 implementation.
+	* sysdeps/unix/sysv/linux/arm/pread64.c: Likewise.
+	* sysdeps/unix/sysv/linux/arm/pwrite.c: Likewise.
+	* sysdeps/unix/sysv/linux/arm/pwrite64.c: Likewise.
+
 1998-12-28  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
 
 	* sysdeps/m68k/dl-machine.h (elf_machine_rela): Reorder expression
diff --git a/Make-dist b/Make-dist
index fb2db62919..5e32c8b543 100644
--- a/Make-dist
+++ b/Make-dist
@@ -149,9 +149,9 @@ ifdef	   subdir
 foo:=$(shell echo subdir foo >&2)
 
 +tsrcs := Makefile $(wildcard Versions) $(wildcard Depend) $(+tsrcs) \
-	  $(addsuffix .c,$(others) $(tests) $(tests-static) $(test-srcs)) \
-	  $(wildcard $(addsuffix .input,$(tests) (tests-static) $(test-srcs)) \
-	  $(addsuffix .args,$(tests) $(tests-static) $(test-srcs)))
+	  $(addsuffix .c,$(others) $(tests) $(test-srcs)) \
+	  $(wildcard $(addsuffix .input,$(tests) $(test-srcs)) \
+	  $(addsuffix .args,$(tests) $(test-srcs)))
 +tardeps := $(strip $(+tsrcs))
 
 verbose = v
diff --git a/Makefile b/Makefile
index 948ad92baa..7dcbeb81eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,99 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
@@ -57,6 +57,7 @@ configure: configure.in aclocal.m4; $(autoconf-it)
 		   subdir_distinfo					\
 		   subdir_echo-headers subdir_echo-distinfo		\
 		   subdir_install					\
+		   subdir_testclean					\
 		   $(addprefix install-, no-libc.a bin lib data headers others)
 
 headers := errno.h sys/errno.h bits/errno.h limits.h values.h	\
@@ -184,7 +185,8 @@ $(all-subdirs-targets):
 
 # Targets to clean things up to various degrees.
 
-.PHONY: clean realclean distclean distclean-1 parent-clean parent-mostlyclean
+.PHONY: clean realclean distclean distclean-1 parent-clean parent-mostlyclean \
+	tests-clean
 
 # Subroutines of all cleaning targets.
 parent-mostlyclean: common-mostlyclean # common-mostlyclean is in Makerules.
@@ -207,6 +209,9 @@ mostlyclean: parent-mostlyclean
 	@$(MAKE) subdir_mostlyclean no_deps=t
 	-rm -f $(postclean)
 
+tests-clean:
+	@$(MAKE) subdir_testclean no_deps=t
+
 # The realclean target is just like distclean for the parent, but we want
 # the subdirs to know the difference in case they care.
 realclean distclean: parent-clean
diff --git a/Makerules b/Makerules
index b40362eb72..f1d346d3b5 100644
--- a/Makerules
+++ b/Makerules
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,99 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
@@ -444,7 +444,7 @@ endif
 
 +depfiles := $(sources:.c=.d) \
 	     $(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \
-	     $(addsuffix .d,$(tests) $(test-srcs) $(tests-static))
+	     $(addsuffix .d,$(tests) $(test-srcs))
 ifeq ($(build-programs),yes)
 +depfiles += $(addsuffix .d,$(others) $(sysdep-others))
 endif
@@ -879,20 +879,22 @@ echo-headers:
 
 # Common cleaning targets.
 
-.PHONY: common-mostlyclean common-clean mostlyclean clean
+.PHONY: common-mostlyclean common-clean mostlyclean clean do-tests-clean
 clean: common-clean
 mostlyclean: common-mostlyclean
 
+do-tests-clean:
+	-rm -f $(addprefix $(objpfx),$(addsuffix .out,$(tests) $(test-srcs)) \
+				     $(addsuffix .sout,$(tests-static)))
+
 # Remove the object files.
 common-mostlyclean:
 	-rm -f $(addprefix $(objpfx),$(tests) $(test-srcs) $(others) \
-				     $(sysdep-others) $(tests-static) stubs \
+				     $(sysdep-others) stubs \
 				     $(addsuffix .o,$(tests) $(test-srcs) \
-						    $(tests-static) \
 						    $(others) \
 						    $(sysdep-others)) \
-				     $(addsuffix .out,$(tests) $(test-srcs)) \
-				     $(addsuffix .sout,$(tests-static)))
+				     $(addsuffix .out,$(tests) $(test-srcs))
 	-rm -f $(addprefix $(objpfx),$(extra-objs) $(install-lib) \
 				     $(install-lib.so) \
 				     $(install-lib.so:%.so=%_pic.a))
@@ -959,7 +961,7 @@ echo > $@.new 'subdir := $(subdir)'
 $(foreach var,subdir-dirs sources elided-routines sysdep_routines \
 	      headers sysdep_headers distribute dont_distribute generated \
 	      others tests test-srcs extra-libs $(extra-libs:%=%-routines) \
-	      tests-static versioned \
+	      versioned \
 	      $(addprefix install-,lib lib.so data bin sbin others),
 echo >> $@.new '$(subdir)-$(var) := $($(var))'
 echo >> $@.new '$(var) = $$($(subdir)-$(var))')
diff --git a/Rules b/Rules
index 5f45413aa7..a5a0c5bf8f 100644
--- a/Rules
+++ b/Rules
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,99 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
@@ -75,10 +75,7 @@ endef
 $(common-objpfx)dummy.c:
 	rm -f $@
 	echo 'void __dummy__ (void) { }' > $@
-$(common-objpfx)empty.c:
-	cp -f /dev/null $@
-common-generated += dummy.o dummy.c empty.c \
-		    $(addprefix empty,$(object-suffixes))
+common-generated += dummy.o dummy.c
 
 # This makes all the auxiliary and test programs.
 
@@ -90,22 +87,16 @@ others: $(addprefix $(objpfx),$(extra-objs))
 endif
 ifeq ($(cross-compiling),yes)
 tests: $(addprefix $(objpfx),$(tests) $(test-srcs))
-ifeq ($(build-static),yes)
-tests: $(addprefix $(objpfx),$(tests-static))
-endif
 else
 tests: $(tests:%=$(objpfx)%.out)
-ifeq ($(build-static),yes)
-tests: $(tests-static:%=$(objpfx)%.sout)
-endif
 endif
 
 ifeq ($(build-programs),yes)
 binaries-all = $(others) $(sysdep-others) $(tests) $(test-srcs)
-binaries-static = $(others-static) $(tests-static) $(test-srcs-static)
+binaries-static = $(others-static)
 else
 binaries-all = $(tests) $(test-srcs)
-binaries-static = $(tests-static) $(test-srcs-static)
+binaries-static =
 endif
 
 binaries-shared = $(filter-out $(binaries-static), $(binaries-all))
@@ -136,26 +127,14 @@ $(objpfx)%.out: %.input $(objpfx)%
 $(objpfx)%.out: /dev/null $(objpfx)%	# Make it 2nd arg for canned sequence.
 	$($*-ENV) $(built-program-cmd) > $@
 endif	# tests
-
-ifneq "$(strip $(tests-static) $(test-static-srcs))" ""
-# These are the implicit rules for making test outputs
-# from the test programs and whatever input files are present.
-$(objpfx)%.sout: %.args $(objpfx)% %.input
-	$($*-ENV) $(built-program-file) `cat $(word 1,$^)` < $(word 3,$^) > $@
-$(objpfx)%.sout: %.args $(objpfx)%
-	$($*-ENV) $(built-program-file) `cat $(word 1,$^)` > $@
-$(objpfx)%.sout: %.input $(objpfx)%
-	$($*-ENV) $(built-program-file) < $(word 1,$^) > $@
-$(objpfx)%.sout: /dev/null $(objpfx)%	# Make it 2nd arg for canned sequence.
-	$($*-ENV) $(built-program-file) > $@
-endif	# tests
 
 .PHONY: distclean realclean subdir_distclean subdir_realclean \
-	subdir_clean subdir_mostlyclean
+	subdir_clean subdir_mostlyclean subdir_testclean
 subdir_mostlyclean: mostlyclean
 subdir_clean: clean
 subdir_distclean: distclean
 subdir_realclean: realclean
+subdir_testclean: do-tests-clean
 realclean: distclean
 distclean: clean
 
@@ -187,19 +166,8 @@ generated: $(addprefix $(common-objpfx),$(common-generated)) \
 .PHONY: before-compile
 before-compile: $(before-compile)
 
-define o-iterator-doit
-$(common-objpfx)empty$o: $(common-objpfx)empty.c $(before-compile);
-	$$(compile-command.c)
-endef
-object-suffixes-left := $(object-suffixes)
-include $(o-iterator)
-
-define o-iterator-doit
-$(common-objpfx)dummy$o: $(common-objpfx)dummy.c $(before-compile);
-	$$(compile-command.c)
-endef
-object-suffixes-left := $(object-suffixes)
-include $(o-iterator)
+$(common-objpfx)dummy.o: $(common-objpfx)dummy.c $(before-compile);
+	$(compile-command.c)
 
 # There's no good place to put this - here will do.
 # The dependencies are wrong if it's run from the top level.
diff --git a/catgets/gencat.c b/catgets/gencat.c
index d632f82bc4..ccc658570c 100644
--- a/catgets/gencat.c
+++ b/catgets/gencat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -237,7 +237,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "1996, 1997");
+"), "1999");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
diff --git a/db2/makedb.c b/db2/makedb.c
index f50b3b09b2..a7a085adba 100644
--- a/db2/makedb.c
+++ b/db2/makedb.c
@@ -1,5 +1,5 @@
 /* Create simple DB database from textual input.
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -243,7 +243,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "1996, 1997, 1998");
+"), "1999");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
diff --git a/debug/catchsegv.sh b/debug/catchsegv.sh
index f5546ffd3c..0e8c36cbdd 100755
--- a/debug/catchsegv.sh
+++ b/debug/catchsegv.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -39,7 +39,7 @@ if test $# -eq 0; then
       ;;
     --v | --ve | --ver | --vers | --versi | --versio | --version)
       echo 'catchsegv (GNU libc) @VERSION@'
-      echo 'Copyright (C) 1998 Free Software Foundation, Inc.
+      echo 'Copyright (C) 1999 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 Written by Ulrich Drepper.'
diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index aeaf695aac..5eeba806a8 100644
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -1,6 +1,6 @@
 #! @BASH@
 
-# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -37,7 +37,7 @@ while test $# -gt 0; do
   case "$1" in
   --vers | --versi | --versio | --version)
     echo 'ldd (GNU libc) @VERSION@'
-    echo $"Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+    echo $"Copyright (C) 1999 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 Written by Roland McGrath and Ulrich Drepper."
diff --git a/iconv/Makefile b/iconv/Makefile
index 8b4f605e5b..431100d7da 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -37,12 +37,11 @@ endif
 distribute	= gconv_builtin.h gconv_int.h loop.c skeleton.c
 
 others		= iconv_prog
+install-others	= $(inst_bindir)/iconv
 
 CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
 
 include ../Rules
 
-subdir_install: $(inst_bindir)/iconv
-
 $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)
 	$(do-install-program)
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index 11914547c7..e6253b8380 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -294,7 +294,10 @@ find_derivation (const char *toset, const char *toset_expand,
   result = derivation_lookup (fromset_expand ?: fromset, toset_expand ?: toset,
 			      handle, nsteps);
   if (result == GCONV_OK)
-    return result;
+    {
+      __libc_lock_unlock (lock);
+      return result;
+    }
 
   /* ### TODO
      For now we use a simple algorithm with quadratic runtime behaviour.
@@ -527,7 +530,10 @@ __gconv_find_transform (const char *toset, const char *fromset,
 
   /* If we don't have a module database return with an error.  */
   if (__gconv_modules_db == NULL)
-    return GCONV_NOCONV;
+    {
+      __libc_lock_unlock (lock);
+      return GCONV_NOCONV;
+    }
 
   /* See whether the names are aliases.  */
   if (__gconv_alias_db != NULL)
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 7dd0f3422c..8f05d57a18 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -1,5 +1,5 @@
 /* Convert text in given files from the specified from-set to the to-set.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -295,7 +295,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "1998");
+"), "1999");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
@@ -319,7 +319,7 @@ process_block (iconv_t cd, const char *addr, size_t len, FILE *output)
       if (outptr != outbuf)
 	{
 	  /* We have something to write out.  */
-	  if (fwrite (outbuf, 1, outptr - outbuf, output)  < outptr - outbuf
+	  if (fwrite (outbuf, 1, outptr - outbuf, output) < outptr - outbuf
 	      || ferror (output))
 	    {
 	      /* Error occurred while printing the result.  */
diff --git a/inet/ether_ntoa.c b/inet/ether_ntoa.c
index 35d61bd2f7..85ca198ebc 100644
--- a/inet/ether_ntoa.c
+++ b/inet/ether_ntoa.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -24,7 +24,7 @@
 char *
 ether_ntoa (const struct ether_addr *addr)
 {
-  char asc[18];
+  static char asc[18];
 
   return ether_ntoa_r (addr, asc);
 }
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index c51c0a14fa..9d6a931123 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -1,5 +1,5 @@
 /* Implementation of the locale program according to POSIX 9945-2.
-   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.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
@@ -268,7 +268,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "1995, 1996, 1997, 1998");
+"), "1999");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index f208d8b874..98443b8e2d 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -1,4 +1,4 @@
-/* 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.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
@@ -404,7 +404,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "1995, 1996, 1997");
+"), "1999");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
diff --git a/malloc/mtrace.pl b/malloc/mtrace.pl
index 3cd217c098..f6b26aaccb 100644
--- a/malloc/mtrace.pl
+++ b/malloc/mtrace.pl
@@ -1,9 +1,9 @@
 #! @PERL@
 eval "exec @PERL@ -S $0 $*"
     if 0;
-# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
-# Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1997.
+# Contributed by Ulrich Drepper <drepper@gnu.org>, 1997.
 # Based on the mtrace.awk script.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ arglist: while (@ARGV) {
 	$ARGV[0] eq "--vers" || $ARGV[0] eq "--versi" ||
 	$ARGV[0] eq "--versio" || $ARGV[0] eq "--version") {
 	print "mtrace (GNU $PACKAGE) $VERSION\n";
-	print "Copyright (C) 1997, 1998 Free Software Foundation, Inc.\n";
+	print "Copyright (C) 1999 Free Software Foundation, Inc.\n";
 	print "This is free software; see the source for copying conditions.  There is NO\n";
 	print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
 	print "Written by Ulrich Drepper <drepper\@gnu.org>\n";
diff --git a/nscd/nscd.c b/nscd/nscd.c
index 162059f681..b2e5843a91 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998 Free Software Foundation, Inc.
+/* Copyright (c) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
 
@@ -224,7 +224,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "1998");
+"), "1999");
   fprintf (stream, gettext ("Written by %s.\n"),
 	   "Thorsten Kukuk and Ulrich Drepper");
 }
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index a8003d97bd..2176f86f54 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 95, 96, 97, 98, 99 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
@@ -149,7 +149,8 @@ $(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=.` -h $< -o ${@:stmp=T}
+	$(rpcgen-cmd) -Y `$(CC) -print-file-name=cpp | sed "s|/cpp$$||"` \
+		      -h $< -o ${@:stmp=T}
 	$(move-if-change) $(@:stmp=T) $(@:stmp=h)
 	touch $@
 
@@ -158,7 +159,8 @@ $(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=.` -c $< -o ${@:stmp=T}
+	$(rpcgen-cmd) -Y `$(CC) -print-file-name=cpp | sed "s|/cpp$$||"` \
+		      -c $< -o ${@:stmp=T}
 	$(move-if-change) $(@:stmp=T) $(@:stmp=c)
 	touch $@
 
diff --git a/sysdeps/unix/sysv/linux/arm/pread64.c b/sysdeps/unix/sysv/linux/arm/pread64.c
new file mode 100644
index 0000000000..c567fc530a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/arm/pread64.c
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/pread64.c>
diff --git a/sysdeps/unix/sysv/linux/arm/pwrite.c b/sysdeps/unix/sysv/linux/arm/pwrite.c
new file mode 100644
index 0000000000..b9b5e35107
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/arm/pwrite.c
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/pwrite.c>
diff --git a/sysdeps/unix/sysv/linux/arm/pwrite64.c b/sysdeps/unix/sysv/linux/arm/pwrite64.c
new file mode 100644
index 0000000000..4993830d26
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/arm/pwrite64.c
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/pwrite64.c>