|
From: <sv...@va...> - 2005-06-28 02:45:34
|
Author: njn
Date: 2005-06-28 03:45:29 +0100 (Tue, 28 Jun 2005)
New Revision: 4039
Log:
Don't mark segments as SF_FIXED when VKI_MAP_FIXED isn't specified.
Modified:
trunk/coregrind/m_libcmman.c
Modified: trunk/coregrind/m_libcmman.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_libcmman.c 2005-06-28 00:12:31 UTC (rev 4038)
+++ trunk/coregrind/m_libcmman.c 2005-06-28 02:45:29 UTC (rev 4039)
@@ -46,14 +46,12 @@
=20
if (!(flags & VKI_MAP_FIXED)) {
start =3D (void *)VG_(find_map_space)((Addr)start, length, !!(flag=
s & VKI_MAP_CLIENT));
-
- flags |=3D VKI_MAP_FIXED;
}
if (start =3D=3D 0)
return (void *)-1;
=20
res =3D VG_(mmap_native)(start, length, prot,=20
- flags & ~(VKI_MAP_NOSYMS | VKI_MAP_CLIENT),
+ (flags | VKI_MAP_FIXED) & ~(VKI_MAP_NOSYMS | V=
KI_MAP_CLIENT),
fd, offset);
=20
// Check it ended up in the right place.
|