diff --git a/ChangeLog b/ChangeLog
index 98accaa70a..cc4eed68df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2001-03-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* math/bits/mathcalls.h: Remove infnan declaration.
+
+2001-03-29  H.J. Lu  <hjl@gnu.org>
+
+	* include/endian.h: Define BIG_ENDI, LITTLE_ENDI, HIGH_HALF,
+	and LOW_HALF only if _LIBC is defined and _ISOMAC is not defined.
+	* stdlib/isomac.c (fmt): Define _LIBC and _ISOMAC.
+	.
+2001-03-29  Isamu Hasegawa  <isamu@yamato.ibm.com>
+
+	* posix/regex.c: Fix typo and add a sentinel.
+
+2001-03-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/shm_open.c: Open new file always with
+	O_NOFOLLOW.  Suggested by Christoph Roland.
+
 2001-03-27  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* sysdeps/s390/bits/string.h: New unified 31/64 bit string.h.
diff --git a/include/endian.h b/include/endian.h
index f522cfe386..e6313ba994 100644
--- a/include/endian.h
+++ b/include/endian.h
@@ -1,6 +1,6 @@
 #include <string/endian.h>
 
-#ifdef _LIBC
+#if defined _LIBC && !defined _ISOMAC
 # if __FLOAT_WORD_ORDER == __BIG_ENDIAN
 #  define BIG_ENDI 1
 #  undef LITTLE_ENDI
diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
index 9334e7fa49..23c272f8a8 100644
--- a/math/bits/mathcalls.h
+++ b/math/bits/mathcalls.h
@@ -1,5 +1,5 @@
 /* Prototype declarations for math functions; helper file for <math.h>.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1998,1999,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
@@ -186,14 +186,6 @@ __MATHDECL_1 (int,isinf,, (_Mdouble_ __value)) __attribute__ ((__const__));
 /* Return nonzero if VALUE is finite and not NaN.  */
 __MATHDECL_1 (int,finite,, (_Mdouble_ __value)) __attribute__ ((__const__));
 
-/* Deal with an infinite or NaN result.
-   If ERROR is ERANGE, result is +Inf;
-   if ERROR is - ERANGE, result is -Inf;
-   otherwise result is NaN.
-   This will set `errno' to either ERANGE or EDOM,
-   and may return an infinity or NaN, or may do something else.  */
-__MATHCALLX (infnan,, (int __error), (__const__));
-
 /* Return the remainder of X/Y.  */
 __MATHCALL (drem,, (_Mdouble_ __x, _Mdouble_ __y));
 
diff --git a/posix/regex.c b/posix/regex.c
index 4c90a4f052..3de24ca206 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -65,7 +65,7 @@
 # define CHAR_CLASS_SIZE ((__alignof__(wctype_t)+sizeof(wctype_t))/sizeof(CHAR_TYPE)+1)
 # define PUT_CHAR(c) \
   do {									      \
-    if (MC_CUR_MAX == 1)						      \
+    if (MB_CUR_MAX == 1)						      \
       putchar (c);							      \
     else								      \
       printf ("%C", (wint_t) c); /* Should we use wide stream??  */	      \
@@ -2338,7 +2338,8 @@ regex_compile (pattern, size, syntax, bufp)
 
 #ifdef MBS_SUPPORT
   /* Initialize the wchar_t PATTERN and offset_buffer.  */
-  p = pend = pattern = TALLOC(csize, CHAR_TYPE);
+  p = pend = pattern = TALLOC(csize + 1, CHAR_TYPE);
+  p[csize] = L'\0';	/* sentinel */
   mbs_offset = TALLOC(csize + 1, int);
   is_binary = TALLOC(csize + 1, char);
   if (pattern == NULL || mbs_offset == NULL || is_binary == NULL)
diff --git a/stdlib/isomac.c b/stdlib/isomac.c
index cfb5672af6..ab63d1b154 100644
--- a/stdlib/isomac.c
+++ b/stdlib/isomac.c
@@ -176,7 +176,7 @@ static char *macros[] =
 /* Format string to build command to invoke compiler.  */
 static const char fmt[] = "\
 echo \"#include <%s>\" |\
-%s -E -dM -ansi -pedantic %s -I. \
+%s -E -dM -ansi -pedantic %s -D_LIBC -D_ISOMAC -I. \
 -isystem `%s --print-prog-name=include` - 2> /dev/null > %s";
 
 
diff --git a/sysdeps/unix/sysv/linux/shm_open.c b/sysdeps/unix/sysv/linux/shm_open.c
index 3808380851..a279cfb470 100644
--- a/sysdeps/unix/sysv/linux/shm_open.c
+++ b/sysdeps/unix/sysv/linux/shm_open.c
@@ -1,4 +1,4 @@
-/* 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
@@ -157,7 +157,7 @@ shm_open (const char *name, int oflag, mode_t mode)
      file on the shmfs.  If this is what should be done the whole function
      should be revamped since we can determine whether shmfs is available
      while trying to open the file, all in one turn.  */
-  fd = open (fname, oflag, mode);
+  fd = open (fname, oflag | O_NOFOLLOW, mode);
   if (fd != -1)
     {
       /* We got a descriptor.  Now set the FD_CLOEXEC bit.  */