* sparc-linux-tdep.c (sparc32_linux_step_trap): New.

[deliverable/binutils-gdb.git] / mmalloc / mmap-sup.c

diff --git a/mmalloc/mmap-sup.c b/mmalloc/mmap-sup.c
index f278789808e84e8756539d3f05535b64541cd1ec..b12e43cf25530455ec03ffb456a9f38b21241c67 100644 (file)
--- a/mmalloc/mmap-sup.c
+++ b/mmalloc/mmap-sup.c
@@ -1,5 +1,5 @@
 /* Support for an sbrk-like function that uses mmap.
-   Copyright 1992 Free Software Foundation, Inc.
+   Copyright 1992, 2000 Free Software Foundation, Inc.
 
    Contributed by Fred Fish at Cygnus Support.   fnf@cygnus.com
 
@@ -22,6 +22,9 @@ Boston, MA 02111-1307, USA.  */
 
 #if defined(HAVE_MMAP)
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>    /* Prototypes for lseek */
+#endif
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/mman.h>
@@ -38,11 +41,22 @@ Boston, MA 02111-1307, USA.  */
    it out. */
 
 static size_t pagesize;
+#if NEED_DECLARATION_GETPAGESIZE
 extern int getpagesize PARAMS ((void));
+#endif
 
 #define PAGE_ALIGN(addr) (caddr_t) (((long)(addr) + pagesize - 1) & \
                                    ~(pagesize - 1))
 
+
+/* Return MAP_PRIVATE if MDP represents /dev/zero.  Otherwise, return
+   MAP_SHARED.  */
+
+#define MAP_PRIVATE_OR_SHARED(MDP) ((MDP -> flags & MMALLOC_DEVZERO) \
+                                    ? MAP_PRIVATE \
+                                    : MAP_SHARED)
+
+
 /*  Get core for the memory region specified by MDP, using SIZE as the
     amount to either add to or subtract from the existing region.  Works
     like sbrk(), but using mmap(). */
@@ -108,7 +122,7 @@ __mmalloc_mmap_morecore (mdp, size)
            {
              /* Let mmap pick the map start address */
              mapto = mmap (0, mapbytes, PROT_READ | PROT_WRITE,
-                           MAP_SHARED, mdp -> fd, foffset);
+                           MAP_PRIVATE_OR_SHARED (mdp), mdp -> fd, foffset);
              if (mapto != (caddr_t) -1)
                {
                  mdp -> base = mdp -> breakval = mapto;
@@ -120,7 +134,8 @@ __mmalloc_mmap_morecore (mdp, size)
          else
            {
              mapto = mmap (mdp -> top, mapbytes, PROT_READ | PROT_WRITE,
-                           MAP_SHARED | MAP_FIXED, mdp -> fd, foffset);
+                           MAP_PRIVATE_OR_SHARED (mdp) | MAP_FIXED, mdp -> fd,
+                           foffset);
              if (mapto == mdp -> top)
                {
                  mdp -> top = moveto;
@@ -147,7 +162,7 @@ __mmalloc_remap_core (mdp)
   /* FIXME:  Quick hack, needs error checking and other attention. */
 
   base = mmap (mdp -> base, mdp -> top - mdp -> base,
-              PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
+              PROT_READ | PROT_WRITE, MAP_PRIVATE_OR_SHARED (mdp) | MAP_FIXED,
               mdp -> fd, 0);
   return ((PTR) base);
 }
@@ -161,13 +176,13 @@ mmalloc_findbase (size)
   caddr_t base = NULL;
 
 #ifdef MAP_ANONYMOUS
-  flags = MAP_SHARED | MAP_ANONYMOUS;
+  flags = MAP_PRIVATE | MAP_ANONYMOUS;
   fd = -1;
 #else
 #ifdef MAP_FILE
-  flags = MAP_SHARED | MAP_FILE;
+  flags = MAP_PRIVATE | MAP_FILE;
 #else
-  flags = MAP_SHARED;
+  flags = MAP_PRIVATE;
 #endif
   fd = open ("/dev/zero", O_RDWR);
   if (fd != -1)