Update. cvs/libc-ud-971201

1997-12-01 17:27  Ulrich Drepper  <drepper@cygnus.com>

	* Makefile (subdirs): Add iconvdata and localedata.

	* iconv/gconv.h: Define UNKNOWN_10646_CHAR as error value.

	* iconv/gconv_conf.c (read_conf_file): Little optimization.

	* iconvdata/8bit-gap.c: New file.
	* iconvdata/8bit-generic.c: Renamed from ...
	* iconvdata/iso8859-generic.c: ...this.
	* iconvdata/configure: Removed.
	* iconvdata/Makefile: Add new modules and better rules.
	* iconvdata/iso6937.c: Minor bug fixes.
	* iconvdata/iso8859-1.c: Likewise.
	* iconvdata/t61.c: Likewise.
	* iconvdata/iso8859-2.c: Change to use 8bit-generic.c.
	Minor bug fixes.
	* iconvdata/iso8859-3.c: Likewise.
	* iconvdata/iso8859-4.c: Likewise.
	* iconvdata/iso8859-5.c: Likewise.
	* iconvdata/iso8859-6.c: Likewise.
	* iconvdata/iso8859-7.c: Likewise.
	* iconvdata/iso8859-8.c: Likewise.
	* iconvdata/iso8859-9.c: Likewise.
	* iconvdata/iso8859-10.c: Likewise.
	* iconvdata/ebcdic-at-de-a.c: New file.
	* iconvdata/ebcdic-at-de.c: New file.
	* iconvdata/ebcdic-ca-fr.c: New file.
	* iconvdata/hp-roman8.c: New file.
	* iconvdata/koi-8.c: New file.
	* iconvdata/koi8-r.c: New file.
	* iconvdata/koi8-h.c: New file.
	* iconvdata/latin-greek-1.c: New file.
	* iconvdata/latin-greek-1.h: New file.
	* iconvdata/latin-greek.c: New file.
	* iconvdata/latin-greek.h: New file.
	* iconvdata/jis0201.c: New file.
	* iconvdata/jis0201.h: New file.
	* iconvdata/jis0208.c: New file.
	* iconvdata/jis0208.h: New file.
	* iconvdata/jis0212.c: New file.
	* iconvdata/jis0212.h: New file.
	* iconvdata/sjis.c: New file.
	* iconvdata/gap.pl: New file.  Script to generate table header.
	* iconvdata/gaptab.pl: New file.
	* iconvdata/gconv-modules: Add info about new modules.

	* locale/programs/charmap.c: Also examine alias names given in charmap
	files.

	* localedata/*: Add to here from add-on.  We need the information
	to generate tables for iconv.

	Update from db-2.3.14.
	* db2/Makefile: Updated.
	* db2/config.h: Likewise.
	* db2/db.h: Likewise.
	* db2/db_int.h: Likewise.
	* db2/btree/bt_cursor.c: Likewise.
	* db2/btree/bt_delete.c: Likewise.
	* db2/btree/bt_put.c: Likewise.
	* db2/btree/bt_search.c: Likewise.
	* db2/btree/bt_split.c: Likewise.
	* db2/btree/btree_auto.c: Likewise.
	* db2/common/db_appinit.c: Likewise.
	* db2/common/db_apprec.c: Likewise.
	* db2/common/db_err.c: Likewise.
	* db2/common/db_region.c: Likewise.
	* db2/db/db_auto.c: Likewise.
	* db2/db/db_dispatch.c: Likewise.
	* db2/db/db_ret.c: Likewise.
	* db2/dbm/dbm.c: Likewise.
	* db2/hash/hash_auto.c: Likewise.
	* db2/include/btree_ext.h: Likewise.
	* db2/include/common_ext.h: Likewise.
	* db2/include/db.h.src: Likewise.
	* db2/include/db_cxx.h: Likewise.
	* db2/include/db_ext.h: Likewise.
	* db2/include/db_int.h.src: Likewise.
	* db2/include/lock.h: Likewise.
	* db2/include/log.h: Likewise.
	* db2/include/mp.h: Likewise.
	* db2/include/mp_ext.h: Likewise.
	* db2/include/os_ext.h: Likewise.
	* db2/include/os_func.h: Likewise.
	* db2/lock/lock.c: Likewise.
	* db2/lock/lock_deadlock.c: Likewise.
	* db2/log/log.c: Likewise.
	* db2/log/log_archive.c: Likewise.
	* db2/log/log_auto.c: Likewise.
	* db2/log/log_get.c: Likewise.
	* db2/log/log_put.c: Likewise.
	* db2/mp/mp_bh.c: Likewise.
	* db2/mp/mp_fget.c: Likewise.
	* db2/mp/mp_fopen.c: Likewise.
	* db2/mp/mp_fput.c: Likewise.
	* db2/mp/mp_fset.c: Likewise.
	* db2/mp/mp_open.c: Likewise.
	* db2/mp/mp_pr.c: Likewise.
	* db2/mp/mp_region.c: Likewise.
	* db2/mp/mp_sync.c: Likewise.
	* db2/mutex/README: Likewise.
	* db2/mutex/mutex.c: Likewise.
	* db2/os/os_open.c: Likewise.
	* db2/os/os_func.c: Removed.
	* db2/os/os_config.c: New file.
	* db2/os/os_spin.c: New file.
	* db2/txn/txn.c: Likewise.
	* db2/txn/txn_auto.c: Likewise.

1997-11-30 06:01  Ulrich Drepper  <drepper@cygnus.com>

	* posix/sys/wait.h (__WAIT_INT): Don't use complex version with
	__typeof for C++ since this fails for class members.
	Reported by Neal Becker <neal@ctd.comsat.com>.

1997-11-28 11:21  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* configure.in: Check for a working makeinfo (3.11 or better).
	* config.make.in: Add MAKEINFO to be substituted.
	* manual/Makefile: Don't update info if makeinfo is too old.

1997-11-30 05:21  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/alpha/setjmp.S: Define _ASM and _SETJMP_H to get definitions.
	* sysdeps/alpha/__longjmp.S: Likewise.
	* sysdeps/unix/sysv/linux/alpha/kernel_termios.h: Include <termios.h>
	not <bits/termios.h>.

	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Define syscall as
	__llseek and make llseek and lseek64 weak aliases.
	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
	Patches by a sun <asun@zoology.washington.edu>.

1997-11-29 19:19  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* misc/sys/syslog.h: Delete KERNEL preprocessor conditional.
	* sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/termios.h: Likewise.
	* misc/sys/syslog.h: Clean up BSD header.

1997-11-29  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/bits/in.h: Add changes from Linux 2.1.67.

	* sysdeps/libm-ieee754/s_ctan.c (__ctan): Raise invalid exception
	for ctan(+-inf,x).
	* sysdeps/libm-ieee754/s_ctanl.c (__ctanl): Likewise.
	* sysdeps/libm-ieee754/s_ctanf.c (__ctanf): Likewise.

	* math/libm-test.c (csqrt_test): Add tests for cabs, carg, ctan,
	csqrt (-1), ctanh(i*pi/4).

1997-11-26  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/generic/bits/confname.h: Fix comma in enumerator.

1997-11-28 13:28  Philip Blundell  <Philip.Blundell@pobox.com>

	* sysdeps/unix/sysv/linux/net/if_arp.h: Add more ARPHRD_ constants.

1997-11-26  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* wcsmbs/wcrtomb.c (__wcrtomb): Remove unused variable fake.

1997-11-26 21:28  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/posix/getcwd.c (GETCWD_STORYGE_CLASS): Remove definition
	and use.  Define GETCWD_RETURN_TYPE instead and use it.
	* sysdeps/unix/sysv/linux/getcwd.c: Define GETCWD_RETURN_TYPE instead
	of GETCWD_STORYGE_CLASS and put the return type and the
	`internal_function' in the right order for gcc 2.7.2.

1997-11-26  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/sys/module.h: Remove file.  It's
	incompatible with Linux 2.1.x.  Packages using modules
	(e.g. modutils) should/do provide their own version.  Suggested by
	Richard Henderson.

	* sysdeps/unix/sysv/linux/Dist: Remove sys/module.h.

	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers)
	[$(subdir)=socket]: Remove sys/module.h.

	* libio/stdio.h: Correct comment of sys_nerr/sys_errlist.

1 files changed, 85 insertions, 24 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index a79e12a291..f08a090363 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -22,12 +22,15 @@
 subdir	:= iconvdata
 
 # Names of all the shared objects which implement the transformations.
-modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5	\
-	   ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10	\
-	   T.61 ISO_6937
+modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		\
+	   ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10		\
+	   T.61 ISO_6937 SJIS KOI-8 KOI8-R LATIN-GREEK LATIN-GREEK-1	\
+	   HP-ROMAN8 EBCDIC-AT-DE EBCDIC-AT-DE-A EBCDIC-CA-FR
 modules.so := $(addsuffix .so, $(modules))
 
 
+include ../Makeconfig
+
 ISO8859-1-routines := iso8859-1
 ISO8859-2-routines := iso8859-2
 ISO8859-3-routines := iso8859-3
@@ -40,15 +43,29 @@ ISO8859-9-routines := iso8859-9
 ISO8859-10-routines := iso8859-10
 T.61-routines := t61
 ISO_6937-routines := iso6937
-
-distribute := iso8859-generic.c \
+SJIS-routines := sjis
+KOI-8-routines := koi-8
+KOI8-R-routines := koi8-r
+LATIN-GREEK-routines := latin-greek
+LATIN-GREEK-1-routines := latin-greek-1
+HP-ROMAN8-routines := hp-roman8
+EBCDIC-AT-DE-routines := ebcdic-at-de
+EBCDIC-AT-DE-A-routines := ebcdic-at-de-a
+EBCDIC-CA-FR-routines := ebcdic-ca-fr
+
+extra-libs = libJIS
+extra-libs-others = $(extra-libs)
+
+libJIS-routines := jis0201 jis0208 jis0212
+libJIS-inhibit-o := $(filter-out .os,$(object-suffixes))
+
+distribute := 8bit-generic.c 8bit-gap.c gap.pl gaptab.pl \
 	      iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c \
 	      iso8859-6.c iso8859-7.c iso8859-8.c iso8859-9.c iso8859-10.c\
-	      iso8859-2.h iso8859-3.h iso8859-4.h iso8859-5.h iso8859-6.h \
-	      iso8859-7.h iso8859-8.h iso8859-9.h iso8859-10.h t61.c	  \
-	      iso6937.c
-
-include ../Makeconfig
+	      t61.c iso6937.c sjis.c jis0201.h jis0208.h jis0212.h	  \
+	      koi-8.c koi8-r.c koi8-r.h hp-roman8.c latin-greek.c	  \
+	      latin-greek.h latin-greek-1.c latin-greek-1.h ebcdic-at-de.c\
+	      ebcdic-at-de-a.c ebcdic-ca-fr.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -76,39 +93,83 @@ install-others	= $(addprefix $(inst_gconvdir)/, $(modules.so))	\
 
 # If we have the localedata add-on available we can build the conversion
 # tables for numerous charsets.
-ifneq (,$(findstring localedata,$(add-ons)))
 define generate-8bit-table
 ( echo "static const wchar_t to_ucs4[256] = {"; \
-  sed -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/  [0x\1] = 0x\2,/p' -e d $^ | sort -u; \
+  sed -e '/^[^[:space:]]*[[:space:]]*.x00/d' -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/  [0x\1] = 0x\2,/p' -e d $^ | sort -u; \
+  echo "};"; \
+  echo "static const char from_ucs4[] = {"; \
+  sed -e '/^[^[:space:]]*[[:space:]]*.x00/d' -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/  [0x\2] = 0x\1,/p' -e d $^ | sort -u; \
+  echo "};" ) > $@.new && rm -f $@ && mv $@.new $@
+endef
+
+sed-generated-headers := iso8859-2.h iso8859-3.h iso8859-4.h iso8859-5.h \
+			 iso8859-6.h iso8859-7.h iso8859-8.h iso8859-9.h \
+			 iso8859-10.h koi-8.h hp-roman8.h ebcdic-at-de.h \
+			 ebcdic-at-de-a.h ebcdic-ca-fr.h
+
+define generate-8bit-gap-table
+( echo "static const wchar_t to_ucs4[256] = {"; \
+  sed -e '/^[^[:space:]]*[[:space:]]*.x00/d' -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/  [0x\1] = 0x\2,/p' -e d $^ | sort -u; \
+  echo "};"; \
+  echo "static struct gap from_idx[] = {"; \
+  sed -e '/^[^[:space:]]*[[:space:]]*.x00/d' -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/0x\2 0x\1/p' -e d $^ | sort -u | $(PERL) gap.pl; \
+  echo "  { start: 0xffff, end: 0xffff, idx:     0 }"; \
   echo "};"; \
   echo "static const char from_ucs4[] = {"; \
-  sed -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/  [0x\2] = 0x\1,/p' -e d $^ | sort -u; \
+  sed -e '/^[^[:space:]]*[[:space:]]*.x00/d' -e 's/^[^[:space:]]*[[:space:]]*.x\(..\)[[:space:]]*<U\(....\)>.*/0x\2 0x\1/p' -e d $^ | sort -u | $(PERL) gaptab.pl; \
   echo "};" ) > $@.new && rm -f $@ && mv $@.new $@
 endef
 
-iso8859-2.h: ../localedata/charmaps/ISO-8859-2
+perl-generated-headers := koi8-r.h latin-greek.h latin-greek-1.h
+
+# The headers must be generated before the compilation.
+before-compile = $(sed-generated-headers) $(perl-generated-headers)
+
+
+# Rules to generate the headers.
+iso8859-2.h: ../localedata/charmaps/ISO-8859-2 Makefile
+	$(generate-8bit-table)
+iso8859-3.h: ../localedata/charmaps/ISO-8859-3 Makefile
+	$(generate-8bit-table)
+iso8859-4.h: ../localedata/charmaps/ISO-8859-4 Makefile
+	$(generate-8bit-table)
+iso8859-5.h: ../localedata/charmaps/ISO-8859-5 Makefile
 	$(generate-8bit-table)
-iso8859-3.h: ../localedata/charmaps/ISO-8859-3
+iso8859-6.h: ../localedata/charmaps/ISO-8859-6 Makefile
 	$(generate-8bit-table)
-iso8859-4.h: ../localedata/charmaps/ISO-8859-4
+iso8859-7.h: ../localedata/charmaps/ISO-8859-7 Makefile
 	$(generate-8bit-table)
-iso8859-5.h: ../localedata/charmaps/ISO-8859-5
+iso8859-8.h: ../localedata/charmaps/ISO-8859-8 Makefile
 	$(generate-8bit-table)
-iso8859-6.h: ../localedata/charmaps/ISO-8859-6
+iso8859-9.h: ../localedata/charmaps/ISO-8859-9 Makefile
 	$(generate-8bit-table)
-iso8859-7.h: ../localedata/charmaps/ISO-8859-7
+iso8859-10.h: ../localedata/charmaps/ISO-8859-10 Makefile
 	$(generate-8bit-table)
-iso8859-8.h: ../localedata/charmaps/ISO-8859-8
+
+koi-8.h: ../localedata/charmaps/KOI-8 Makefile
+	$(generate-8bit-table)
+
+hp-roman8.h: ../localedata/charmaps/HP-ROMAN8 Makefile
 	$(generate-8bit-table)
-iso8859-9.h: ../localedata/charmaps/ISO-8859-9
+
+ebcdic-at-de.h: ../localedata/charmaps/EBCDIC-AT-DE Makefile
+	$(generate-8bit-table)
+ebcdic-at-de-a.h: ../localedata/charmaps/EBCDIC-AT-DE-A Makefile
 	$(generate-8bit-table)
-iso8859-10.h: ../localedata/charmaps/ISO-8859-10
+ebcdic-ca-fr.h: ../localedata/charmaps/EBCDIC-CA-FR Makefile
 	$(generate-8bit-table)
 
-headers: iso8859-2.h iso8859-3.h iso8859-4.h iso8859-5.h iso8859-6.h	\
-	 iso8859-7.h iso8859-8.h iso8859-9.h iso8859-10.h
+ifneq ($(PERL),no)
+koi8-r.h: ../localedata/charmaps/KOI8-R Makefile
+	$(generate-8bit-gap-table)
+latin-greek.h: ../localedata/charmaps/LATIN-GREEK Makefile
+	$(generate-8bit-gap-table)
+latin-greek-1.h: ../localedata/charmaps/LATIN-GREEK-1 Makefile
+	$(generate-8bit-gap-table)
 endif
 
+headers: $(sed-generated-headers) $(perl-generated-headers)
+
 
 $(addprefix $(inst_gconvdir)/, $(modules.so)): $(inst_gconvdir)/%: $(objpfx)%
 	$(do-install-program)