commit a38236052990f950a96506ef2873b2a2684d8ba0
author njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Jun 28 02:45:29 2005 +0000
committer njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Jun 28 02:45:29 2005 +0000
tree 1577942ccc7dda5f029815b58e575bc6e9f45b83
parent ef52b9da0417979c2be3e9800526dc0a63c553ec

Don't mark segments as SF_FIXED when VKI_MAP_FIXED isn't specified.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4039 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/m_libcmman.c

diff --git a/coregrind/m_libcmman.c b/coregrind/m_libcmman.c
index cf4fd3a..59a0df1 100644
--- a/coregrind/m_libcmman.c
+++ b/coregrind/m_libcmman.c
@@ -46,14 +46,12 @@
 
    if (!(flags & VKI_MAP_FIXED)) {
       start = (void *)VG_(find_map_space)((Addr)start, length, !!(flags & VKI_MAP_CLIENT));
-
-      flags |= VKI_MAP_FIXED;
    }
    if (start == 0)
       return (void *)-1;
 
    res = VG_(mmap_native)(start, length, prot, 
-                          flags & ~(VKI_MAP_NOSYMS | VKI_MAP_CLIENT),
+                          (flags | VKI_MAP_FIXED) & ~(VKI_MAP_NOSYMS | VKI_MAP_CLIENT),
                           fd, offset);
 
    // Check it ended up in the right place.