Update.

2001-03-09  Ulrich Drepper  <drepper@redhat.com>

	* catgets/Makefile (generated): Add test-gencat.h.
	(sample.SJIS.cat): Also generate header.
	* catgets/sample.SJIS: Add new set and message, both with symbolic
	names.
	* catgets/test-gencat.sh: Also compare generated header with what
	we expect.

2001-03-07  Jakub Jelinek  <jakub@redhat.com>

	* catgets/gencat.c (read_input_file): Preserve properly symbolic
	names.

2001-03-06  Andreas Jaeger  <aj@suse.de>

	* sysdeps/s390/dl-machine.h (elf_machine_relplt): Removed, it's not
	needed.
	(elf_machine_pltrel_p): Likewise.
	* sysdeps/powerpc/dl-machine.h: Likewise.
	* sysdeps/generic/dl-machine.h (elf_machine_pltrel_p): Likewise.

2001-03-09  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/arm/Dist: Add dl-procinfo.c and
	dl-procinfo.h.

2001-03-05  Philip Blundell  <philb@gnu.org>

	* sysdeps/unix/sysv/linux/arm/dl-procinfo.c: New file.
	* sysdeps/unix/sysv/linux/arm/dl-procinfo.h: New file.
	* sysdeps/unix/sysv/linux/arm/Makefile [subdir=elf]
	(sysdep-dl-routines, sysdep_routines, sysdep-rtld-routines): Add
	dl-procinfo.

2001-03-09  Ulrich Drepper  <drepper@redhat.com>

	* dlfcn/tstatexit.c (main): Don't perform the test if __dso_handle
	is not available.
	* dlfcn/tstcxaatexit.c (main): Likewise.

4 files changed, 54 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ca4e16..8ec99f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2001-03-09  Ulrich Drepper  <drepper@redhat.com>
+
+	* catgets/Makefile (generated): Add test-gencat.h.
+	(sample.SJIS.cat): Also generate header.
+	* catgets/sample.SJIS: Add new set and message, both with symbolic
+	names.
+	* catgets/test-gencat.sh: Also compare generated header with what
+	we expect.
+
+2001-03-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* catgets/gencat.c (read_input_file): Preserve properly symbolic
+	names.
+
+2001-03-06  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/s390/dl-machine.h (elf_machine_relplt): Removed, it's not
+	needed.
+	(elf_machine_pltrel_p): Likewise.
+	* sysdeps/powerpc/dl-machine.h: Likewise.
+	* sysdeps/generic/dl-machine.h (elf_machine_pltrel_p): Likewise.
+
+2001-03-09  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/arm/Dist: Add dl-procinfo.c and
+	dl-procinfo.h.
+
+2001-03-05  Philip Blundell  <philb@gnu.org>
+
+	* sysdeps/unix/sysv/linux/arm/dl-procinfo.c: New file.
+	* sysdeps/unix/sysv/linux/arm/dl-procinfo.h: New file.
+	* sysdeps/unix/sysv/linux/arm/Makefile [subdir=elf]
+	(sysdep-dl-routines, sysdep_routines, sysdep-rtld-routines): Add
+	dl-procinfo.
+
+2001-03-09  Ulrich Drepper  <drepper@redhat.com>
+
+	* dlfcn/tstatexit.c (main): Don't perform the test if __dso_handle
+	is not available.
+	* dlfcn/tstcxaatexit.c (main): Likewise.
+
 2001-03-10  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/i386/fpu/libm-test-ulps: Revert last patch.
diff --git a/catgets/Makefile b/catgets/Makefile
index 8047f8a..677fe42 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -45,7 +45,7 @@ $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
 catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \
 	    -DHAVE_CONFIG_H
 
-generated = de.msg test1.cat test1.h sample.SJIS.cat
+generated = de.msg test1.cat test1.h sample.SJIS.cat test-gencat.h
 generated-dirs = de
 
 tst-catgets-ENV = NLSPATH="$(objpfx)%l/%N.cat" LANG=de
@@ -74,5 +74,5 @@ $(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \
 
 $(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat
 	GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
-	$(built-program-cmd) < $(word 1,$^) > $@
+	$(built-program-cmd) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@
 endif
diff --git a/catgets/sample.SJIS b/catgets/sample.SJIS
index 9ffcc01..80156e0 100644
--- a/catgets/sample.SJIS
+++ b/catgets/sample.SJIS
@@ -8,3 +8,5 @@ $set 1
 3 sample3:予定表:
 4 sample4:TEST\tTAB:
 5 sample5:機能\t十種類:
+$set Another
+FOO "message foo"
diff --git a/catgets/test-gencat.sh b/catgets/test-gencat.sh
index 99de335..d30c6a6 100755
--- a/catgets/test-gencat.sh
+++ b/catgets/test-gencat.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test escape character handling in gencat.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 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
@@ -36,5 +36,12 @@ sample3:予定表:
 sample4:TEST	TAB:
 sample5:機能	十種類:
 EOF
+res=$?
 
-exit $?
+cat <<EOF |
+#define AnotherSet 0x2	/* *standard input*:11 */
+#define AnotherFOO 0x1	/* *standard input*:12 */
+EOF
+cmp ${common_objpfx}catgets/test-gencat.h - || res=1
+
+exit $res