Update.

2001-03-26  Ben Collins  <bcollins@debian.org>

	* sysdeps/unix/sysv/linux/mips/bits/mman.h: Add MAP_* and MADV_*
	defines to match other architectures.

diff --git a/ChangeLog b/ChangeLog
index a5b8f2e969a7eba2edf3c9541b6062d92745dcbc..25b7f4110d1865760b6e7dc2d10b705003c85cfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-26  Ben Collins  <bcollins@debian.org>
+
+       * sysdeps/unix/sysv/linux/mips/bits/mman.h: Add MAP_* and MADV_*
+       defines to match other architectures.
+
 2001-03-26  Ulrich Drepper  <drepper@redhat.com>
 
        * libio/Makefile (tests): Add tst-ext.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 2b24584eb23fd9bec88037cc3dfb18d56f2a6c4f..be532d55f1475d7a99ff59b924be20bc480972e6 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-26  Ulrich Drepper  <drepper@redhat.com>
+
+       * attr.c (pthread_getattr_np): Correct computation of stack size
+       for machiens with register stack.
+
+       * Examples/ex17.c (main): Correct detection of failed mmap call.
+
 2001-03-21  Jakub Jelinek  <jakub@redhat.com>
 
        * pthread.c (__pthread_initialize_manager): Fix a typo.

diff --git a/linuxthreads/Examples/ex17.c b/linuxthreads/Examples/ex17.c
index bedf86806f8812d194402373084fa58f08fdc236..f5c99ee3fb5fdcba0ddc4b71d559024c27baa351 100644 (file)
--- a/linuxthreads/Examples/ex17.c
+++ b/linuxthreads/Examples/ex17.c
@@ -28,7 +28,7 @@ main (void)
                PROT_READ | PROT_WRITE | PROT_EXEC,
                MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
-  if (stack == (void *)-1)
+  if (stack == MAP_FAILED)
     {
       perror ("mmap failed");
       return 1;

diff --git a/linuxthreads/attr.c b/linuxthreads/attr.c
index b6b1d9c92b0a9a79329600663ad301b26c4d84b1..2d06025ba42b605b3a57c069fa9146570b0739fc 100644 (file)
--- a/linuxthreads/attr.c
+++ b/linuxthreads/attr.c
@@ -288,7 +288,8 @@ int pthread_getattr_np (pthread_t thread, pthread_attr_t *attr)
   attr->__guardsize = descr->p_guardsize;
   attr->__stackaddr_set = descr->p_userstack;
 #ifdef NEED_SEPARATE_REGISTER_STACK
-  attr->__stacksize *= 2;
+  if (descr->p_userstack == 0)
+    attr->__stacksize *= 2;
   /* XXX This is awkward.  The guard pages are in the middle of the
      two stacks.  We must count the guard size in the stack size since
      otherwise the range of the stack area cannot be computed.  */
@@ -297,7 +298,7 @@ int pthread_getattr_np (pthread_t thread, pthread_attr_t *attr)
 #ifndef _STACK_GROWS_UP
   attr->__stackaddr = (char *)(descr + 1);
 #else
-#error __stackaddr not handled
+# error __stackaddr not handled
 #endif
 
   return 0;

diff --git a/sysdeps/unix/sysv/linux/mips/bits/mman.h b/sysdeps/unix/sysv/linux/mips/bits/mman.h
index 5b8c752ccd018e7968ebf380a0095e800579e29c..f6c5094f8711de08f0f92a3436dc562fb501020e 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/mman.h
@@ -53,10 +53,12 @@
 
 /* These are Linux-specific.  */
 #ifdef __USE_MISC
-# define MAP_GROWSDOWN 0x1000          /* Stack-like segment.  */
+# define MAP_NORESERVE 0x0400          /* don't check for reservations */
+# define MAP_ANONYMOUS 0x0800          /* don't use a file */
+# define MAP_GROWSDOWN 0x1000          /* stack-like segment */
 # define MAP_DENYWRITE 0x2000          /* ETXTBSY */
-# define MAP_EXECUTABLE        0x4000          /* Mark it as an executable.  */
-# define MAP_NORESERVE 0x0400          /* Don't check for reservations.  */
+# define MAP_EXECUTABLE        0x4000          /* mark it as an executable */
+# define MAP_LOCKED    0x8000          /* pages are locked */
 #endif
 
 /* Flags to `msync'.  */
@@ -69,6 +71,15 @@
 #define MCL_FUTURE     2               /* Lock all additions to address
                                           space.  */
 
+/* Advice to `madvise'.  */
+#ifdef __USE_BSD
+#define MADV_NORMAL    0               /* default page-in behavior */
+#define MADV_RANDOM    1               /* page-in minimum required */
+#define MADV_SEQUENTIAL        2               /* read-ahead aggressively */
+#define MADV_WILLNEED  3               /* pre-fault pages */
+#define MADV_DONTNEED  4               /* discard these pages */
+#endif
+
 /* Flags for `mremap'.  */
 #ifdef __USE_GNU
 # define MREMAP_MAYMOVE        1