* locale/loadlocale.c (_nl_load_locale): Use MAP_INHERIT flag in

 	mmap call.

	* configure.in (os=freebsd*|bsdi*): Set base_os=unix/bsd/bsd4.4
 	for these too.

	* sysdeps/unix/sysv/tcsetattr.c: Use |= instead of = to properly
 	set c_oflag value.

	* Makeconfig [! objpfx] (csu-objpfx): Add trailing slash.

	* locale/Makefile (categories): Uncomment collate.
	* locale/lc-collate.c: New file.

7 files changed, 48 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index e347722665..8111bc65cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 Sat Apr  8 00:40:59 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* locale/loadlocale.c (_nl_load_locale): Use MAP_INHERIT flag in
+ 	mmap call.
+
+	* configure.in (os=freebsd*|bsdi*): Set base_os=unix/bsd/bsd4.4
+ 	for these too.
+
+	* sysdeps/unix/sysv/tcsetattr.c: Use |= instead of = to properly
+ 	set c_oflag value.
+
+	* Makeconfig [! objpfx] (csu-objpfx): Add trailing slash.
+
+	* locale/Makefile (categories): Uncomment collate.
+	* locale/lc-collate.c: New file.
+
 	* malloc/free.c (__malloc_safe_bcopy, memmove): Don't define
  	#ifdef emacs.
 	* malloc/realloc.c: Likewise.
diff --git a/Makeconfig b/Makeconfig
index 8cee8c066d..1080646bc2 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -260,7 +260,7 @@ endif
 ifdef objpfx
 csu-objpfx = $(objpfx)
 else
-csu-objpfx = $(..)csu
+csu-objpfx = $(..)csu/
 endif
 
 ifndef LD
diff --git a/configure.in b/configure.in
index 4ebe404b8b..7badd6161c 100644
--- a/configure.in
+++ b/configure.in
@@ -91,7 +91,7 @@ os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`"
 case "$os" in
 gnu*)
   base_os=mach/hurd ;;
-netbsd* | 386bsd*)
+netbsd* | 386bsd* | freebsd* | bsdi*)
   base_os=unix/bsd/bsd4.4 ;;
 osf* | sunos* | ultrix* | newsos* | dynix* | *bsd*)
   base_os=unix/bsd ;;
diff --git a/locale/Makefile b/locale/Makefile
index ec80014c99..87a6706e05 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -24,7 +24,7 @@ subdir	:= locale
 headers		:= locale.h
 distribute	:= localeinfo.h categories.def
 routines	:= setlocale loadlocale localeconv
-categories	:= ctype messages monetary numeric time # collate
+categories	:= ctype messages monetary numeric time collate
 aux		= $(categories:%=lc-%) $(categories:%=C-%)
 
 include ../Rules
diff --git a/locale/lc-collate.c b/locale/lc-collate.c
new file mode 100644
index 0000000000..8684f23266
--- /dev/null
+++ b/locale/lc-collate.c
@@ -0,0 +1,22 @@
+/* Define current locale data for LC_COLLATE category.
+Copyright (C) 1995 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
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#include "localeinfo.h"
+
+_NL_CURRENT_DEFINE (LC_COLLATE);
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index f3e8e4ad9b..bc9102bf28 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -106,8 +106,13 @@ _nl_load_locale (int category, char **name)
     /* Some systems do not have this flag; it is superfluous.  */
 #define	MAP_FILE 0
 #endif
+#ifndef MAP_INHERIT
+    /* Some systems might lack this; they lose.  */
+#define MAP_INHERIT 0
+#endif
     filedata = (void *) __mmap ((caddr_t) 0, st.st_size,
-				PROT_READ, MAP_FILE|MAP_COPY, fd, 0);
+				PROT_READ, MAP_FILE|MAP_COPY|MAP_INHERIT,
+				fd, 0);
     if (filedata == (void *) -1)
       {
 	if (errno == ENOSYS)
diff --git a/sysdeps/unix/sysv/tcsetattr.c b/sysdeps/unix/sysv/tcsetattr.c
index 30e1b0b48d..230a258e42 100644
--- a/sysdeps/unix/sysv/tcsetattr.c
+++ b/sysdeps/unix/sysv/tcsetattr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995 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
@@ -123,9 +123,9 @@ DEFUN(tcsetattr, (fd, optional_actions, termios_p),
 
   buf.c_oflag = 0;
   if (termios_p->c_oflag & OPOST)
-    buf.c_oflag = _SYSV_OPOST;
+    buf.c_oflag |= _SYSV_OPOST;
   if (termios_p->c_oflag & ONLCR)
-    buf.c_oflag = _SYSV_ONLCR;
+    buf.c_oflag |= _SYSV_ONLCR;
 
   /* So far, buf.c_cflag contains the speed in CBAUD.  */
   if (termios_p->c_cflag & CSTOPB)