commit 6fb883e8e3ce8fc661e4bb9f068565b4ccd97abf
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Jul 09 17:12:39 2003 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Jul 09 17:12:39 2003 +0000
tree 1b1621284b3be094f99ba00478e7e54749a30259
parent 6e295807acbaf7eb3200a685376fb968ebdb8571

ARM fix: mmap


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@315 c046a42c-6fe2-441c-8c8c-71466251a162

linux-user/syscall.c

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index cd3fdf5..932fe46 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1791,8 +1791,8 @@
         goto unimplemented;
     case TARGET_NR_readdir:
         goto unimplemented;
-#ifdef TARGET_I386
     case TARGET_NR_mmap:
+#if defined(TARGET_I386) || defined(TARGET_ARM)
         {
             uint32_t v1, v2, v3, v4, v5, v6, *vptr;
             vptr = (uint32_t *)arg1;
@@ -1806,13 +1806,14 @@
                                         target_to_host_bitmask(v4, mmap_flags_tbl),
                                         v5, v6));
         }
-        break;
-#endif
-#ifdef TARGET_I386
-    case TARGET_NR_mmap2:
 #else
-    case TARGET_NR_mmap:
+        ret = get_errno(target_mmap(arg1, arg2, arg3, 
+                                    target_to_host_bitmask(arg4, mmap_flags_tbl), 
+                                    arg5,
+                                    arg6));
 #endif
+        break;
+    case TARGET_NR_mmap2:
         ret = get_errno(target_mmap(arg1, arg2, arg3, 
                                     target_to_host_bitmask(arg4, mmap_flags_tbl), 
                                     arg5,