commit e96ade3a34b4da01bd396f0c9158dabfa2c6f4ec
author mseaborn@chromium.org <mseaborn@chromium.org@829466d3-f3f5-3ae4-62ad-de35cf9bba21> Sat Oct 27 17:47:38 2012 +0000
committer mseaborn@chromium.org <mseaborn@chromium.org@829466d3-f3f5-3ae4-62ad-de35cf9bba21> Sat Oct 27 17:47:38 2012 +0000
tree 21d7a9a2a61507249e61e175b198935f0fc395ad
parent 8263cc3477e314ade847e81c4fd842d0735c77fc

Revert r15: Fix the calling conventions for the sixth argument on i386

The change in r15 was incorrect and it breaks nacl_helper_bootstrap on
Linux, which calls mmap() (which takes 6 arguments) via
linux_syscall_support.h.

BUG=none
TEST=run_hello_world_test in NaCl on x86-32

Review URL: https://codereview.chromium.org/11313020

git-svn-id: http://linux-syscall-support.googlecode.com/svn/trunk/lss@16 829466d3-f3f5-3ae4-62ad-de35cf9bba21

linux_syscall_support.h

diff --git a/linux_syscall_support.h b/linux_syscall_support.h
index 55b3d88..f1aad3a 100644
--- a/linux_syscall_support.h
+++ b/linux_syscall_support.h
@@ -1586,8 +1586,8 @@
         struct { long __a1; long __a6; } __s = { (long)arg1, (long) arg6 };   \
         __asm__ __volatile__("push %%ebp\n"                                   \
                              "push %%ebx\n"                                   \
-                             "leal 4(%2),%%ebp\n"                             \
-                             "movl 0(%2),%%ebx\n"                             \
+                             "movl 4(%2),%%ebp\n"                             \
+                             "movl 0(%2), %%ebx\n"                            \
                              "movl %1,%%eax\n"                                \
                              LSS_ENTRYPOINT                                   \
                              "pop  %%ebx\n"                                   \