commit 7dd46c02e4b83be7fbabe81465137d7116b6add6
author Richard Henderson <rth@twiddle.net> Mon May 03 10:07:49 2010 -0700
committer Aurelien Jarno <aurelien@aurel32.net> Fri May 21 16:22:20 2010 +0000
tree c5e7e751cd285dce8984d797ca74b4b2ee86998f
parent 7868652357a9deb32b2f2d48b8563f2aeebba775

alpha-linux-user: Fix brk error return.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

linux-user/syscall.c

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ce728fa..746967a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -718,9 +718,17 @@
                                         PROT_READ|PROT_WRITE,
                                         MAP_ANON|MAP_FIXED|MAP_PRIVATE, 0, 0));
 
-    if (!is_error(mapped_addr))
+#if defined(TARGET_ALPHA)
+    /* We (partially) emulate OSF/1 on Alpha, which requires we
+       return a proper errno, not an unchanged brk value.  */
+    if (is_error(mapped_addr)) {
+        return -TARGET_ENOMEM;
+    }
+#endif
+
+    if (!is_error(mapped_addr)) {
 	target_brk = new_brk;
-    
+    }
     return target_brk;
 }