Update.cvs/libc-ud-970507

	* locale/categories.def: Change type of _NL_CTYPE_CLASS_NAMES and
	_NL_CTYPE_MAP_NAMES field to stringlist.
	Change name of _NL_CTYPE_CODESET_NAME to "charmap".
	* locale/localeinfo.h (enum value_type): Add stringlist.
	* locale/programs/locale.c (show_info): Handle stringlist.

	* locale/programs/charmap.c (charmap_read): If charmap file is not
	using the given name try to find it by looking through all available
	charmap files and compare the code set name.
	* locale/programs/locale.c (write_charmaps): Also print names of
	charset in <code_set_name> fields in the files.

	* elf/ldd.bash.in: Correct translatable strings.

	* posix/TESTS: Add some more tests for character class matching.
	* posix/regex.c: Merge with GNU awk version.
	(regex_compile): Use ISO C/amend 1 functions for character class
	handling.
	* posix/regex.h: Merge with GNU awk version.

	* posix/getopt.c: Declare as master copies.
	* posix/getopt1.c: Likewise.
	* posix/getopt.h: Likewise.

	* sysdeps/unix/sysv/linux/sys/mount.h: Add definitions for option
	value to mount functions.
	Patch by a sun <asun@zoology.washington.edu>.

	* stdio-common/bug4.c (main): Use /tmp/bug4.test for concurrency
	with other tests.
	* sunrpc/svc_run.c (svc_exit): New, defined.
	(svc_run): Test for svc_stop variable.
	* sysdeps/m68k/s_cexp.c: Rewritten.
	* sysdeps/m68k/s_cexpf.c: Likewise.
	* sysdeps/m68k/s_cexpl.c: Likewise.

71 files changed, 2854 insertions, 781 deletions

diff --git a/ChangeLog b/ChangeLog
index b6269a38c6..a0106c9fd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,33 @@
 1997-05-07 16:31  Ulrich Drepper  <drepper@cygnus.com>
 
+	* locale/categories.def: Change type of _NL_CTYPE_CLASS_NAMES and
+	_NL_CTYPE_MAP_NAMES field to stringlist.
+	Change name of _NL_CTYPE_CODESET_NAME to "charmap".
+	* locale/localeinfo.h (enum value_type): Add stringlist.
+	* locale/programs/locale.c (show_info): Handle stringlist.
+
+	* locale/programs/charmap.c (charmap_read): If charmap file is not
+	using the given name try to find it by looking through all available
+	charmap files and compare the code set name.
+	* locale/programs/locale.c (write_charmaps): Also print names of
+	charset in <code_set_name> fields in the files.
+
+	* elf/ldd.bash.in: Correct translatable strings.
+
+	* posix/TESTS: Add some more tests for character class matching.
+	* posix/regex.c: Merge with GNU awk version.
+	(regex_compile): Use ISO C/amend 1 functions for character class
+	handling.
+	* posix/regex.h: Merge with GNU awk version.
+
+	* posix/getopt.c: Declare as master copies.
+	* posix/getopt1.c: Likewise.
+	* posix/getopt.h: Likewise.
+
+	* sysdeps/unix/sysv/linux/sys/mount.h: Add definitions for option
+	value to mount functions.
+	Patch by a sun <asun@zoology.washington.edu>.
+
 	* sysdeps/i386/dl-machine.h (elf_machine_rel): Check for mismatch
 	in size for copy relocation.
 	* sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise.
@@ -9,13 +37,13 @@
 
 1997-05-06 13:25  H.J. Lu  <hjl@gnu.ai.mit.edu>
 
-	* stdio-common/bug4.c (main): Use /tmp/bug4.test for concurrency
-	with other tests.
 	* stdio-common/bug3.c (main): Use /tmp/bug3.test for concurrency
 	with other tests.
+	* stdio-common/bug4.c (main): Use /tmp/bug4.test for concurrency
+	with other tests.
 
-	* sunrpc/svc_run.c: svc_exit): New, defined.  (svc_run): Test for
-	svc_stop variable.
+	* sunrpc/svc_run.c (svc_exit): New, defined.
+	(svc_run): Test for svc_stop variable.
 	* sunrpc/rpc/svc.h (svc_exit): New, declared.
 
 1997-05-03 08:47  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
@@ -40,10 +68,13 @@
 
 	* sysdeps/m68k/s_ccosh.c: Rewritten.
 	* sysdeps/m68k/s_csinh.c: Rewritten.
+	* sysdeps/m68k/s_cexp.c: Rewritten.
 	* sysdeps/m68k/s_ccoshf.c: Don't define huge_val.
 	* sysdeps/m68k/s_ccoshl.c: Likewise.
 	* sysdeps/m68k/s_csinhf.c: Likewise.
 	* sysdeps/m68k/s_csinhl.c: Likewise.
+	* sysdeps/m68k/s_cexpf.c: Likewise.
+	* sysdeps/m68k/s_cexpl.c: Likewise.
 
 	* sysdeps/m68k/s_ccos.c: New file.
 	* sysdeps/m68k/s_ccosf.c: New file.
diff --git a/Makerules b/Makerules
index 10cbd972e4..31b965f3d7 100644
--- a/Makerules
+++ b/Makerules
@@ -477,8 +477,8 @@ others: $(addprefix $(objpfx),$(install-lib))
 ifndef objects
 
 # Create the stamp$o files to keep the parent makefile happy.
-subdir_lib: $(foreach o,$(object-suffixes),$(objpfx)stamp$o-$(subdir))
-$(foreach o,$(object-suffixes),$(objpfx)stamp$o-$(subdir)):
+subdir_lib: $(foreach o,$(object-suffixes),$(objpfx)stamp$o)
+$(foreach o,$(object-suffixes),$(objpfx)stamp$o):
 	$(make-target-directory)
 	rm -f $@; > $@
 else
@@ -490,19 +490,19 @@ else
 define o-iterator-doit
 $(common-objpfx)$(patsubst %,$(libtype$o),c)(\
 $(addsuffix .%,$(filter-out $(elide-routines$o),$(notdir $(objects:.o=))))): \
-  $(objpfx)stamp.%-$(subdir) ;
+  $(objpfx)stamp.% ;
 endef
 object-suffixes-left := $(object-suffixes)
 include $(o-iterator)
 
-# The pattern rule tells Make to remake $(objpfx)stamp.%-$(subdir) as
+# The pattern rule tells Make to remake $(objpfx)stamp.% as
 # the way to update all the foo.% object files in $(objects).  Now we
-# define explicit rules to update each $(objpfx)stamp.SUFFIX-$(subdir)
+# define explicit rules to update each $(objpfx)stamp.SUFFIX
 # timestamp file; these rules (one explicit rule is generated for each
 # object suffix) will update the parent archive with ar.  Use a static
 # pattern rule so $* is set to the object type during the commands.
 define o-iterator-doit
-$(objpfx)stamp$o-$(subdir): $(objpfx)stamp%-$(subdir): $(o-objects); $$(do-ar)
+$(objpfx)stamp$o: $(objpfx)stamp%: $(o-objects); $$(do-ar)
 endef
 object-suffixes-left := $(object-suffixes)
 include $(o-iterator)
@@ -529,7 +529,7 @@ $(common-objpfx)$(patsubst %,$(libtype$o),c)($(ar-symtab-name)): \
 	  $$(RANLIB) $$(common-objpfx)$$(patsubst %,$$(libtype$o),c)
 endef
 ifndef subdir
-subdirs-stamps := $(foreach d,$(subdirs),$(common-objpfx)$d/stamp%-$d)
+subdirs-stamps := $(foreach d,$(subdirs),$(common-objpfx)$d/stamp%)
 subdirs-stamp-o = $(subst %,$o,$(subdirs-stamps))
 $(subdirs-stamps): subdir_lib;
 endif
@@ -866,7 +866,7 @@ common-mostlyclean:
 	$(rmobjs)
 define rmobjs
 $(foreach o,$(object-suffixes),
--rm -f $(addprefix $(objpfx),stamp$o-$(subdir)) $(o-objects))
+-rm -f $(objpfx)stamp$o $(o-objects))
 endef
 
 # Also remove the dependencies and generated source files.
diff --git a/config.guess b/config.guess
index b6f37c9919..bfd352355e 100755
--- a/config.guess
+++ b/config.guess
@@ -168,6 +168,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	sed 's/^	//' << EOF >dummy.c
 	int main (argc, argv) int argc; char **argv; {
diff --git a/csu/Makefile b/csu/Makefile
index 9664821ec4..5888d1098e 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -81,6 +81,10 @@ $(objpfx)defs.h: $(objpfx)initfini.s
 
 endif
 
+ifeq (yes,$(elf))
+extra-objs += abi-note.o
+endif
+
 include ../Rules
 
 define link-relocatable
diff --git a/csu/abi-note.S b/csu/abi-note.S
index baa409de4d..d2051e5b3b 100644
--- a/c