[Qemu-devel] [PATCH, v2] Fix building with glibc < 2.4

[Kirill A. Shutemov]

Prior to version 2.4, glibc did not expose the definition of
MREMAP_FIXED, and the prototype for mremap() did not allow
for the new_address argument.

Tested only with glibc 2.9.

Signed-off-by: Kirill A. Shutemov <address@hidden>
Signed-off-by: Robert Reif <address@hidden>
---
 linux-user/mmap.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 89254ae..35753e3 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -24,6 +24,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/mman.h>
+#include <linux/mman.h>
+#include <linux/unistd.h>
 
 #include "qemu.h"
 #include "qemu-common.h"
@@ -554,8 +556,8 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong 
old_size,
     mmap_lock();
 
     if (flags & MREMAP_FIXED)
-        host_addr = mremap(g2h(old_addr), old_size, new_size,
-                           flags, new_addr);
+        host_addr = (void *) syscall(__NR_mremap, g2h(old_addr),
+                old_size, new_size, flags, new_addr);
     else if (flags & MREMAP_MAYMOVE) {
         abi_ulong mmap_start;
 
@@ -564,9 +566,11 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong 
old_size,
         if (mmap_start == -1) {
             errno = ENOMEM;
             host_addr = MAP_FAILED;
-        } else
-            host_addr = mremap(g2h(old_addr), old_size, new_size,
-                               flags | MREMAP_FIXED, g2h(mmap_start));
+        } else {
+            host_addr = (void *) syscall(__NR_mremap, g2h(old_addr),
+                    old_size, new_size, flags | MREMAP_FIXED,
+                    g2h(mmap_start));
+        }
     } else {
         host_addr = mremap(g2h(old_addr), old_size, new_size, flags);
         /* Check if address fits target address space */
-- 
1.6.0.2.GIT