Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / native_client / src / nonsfi / linux / linux_pthread_private.c

diff --git a/src/native_client/src/nonsfi/linux/linux_pthread_private.c b/src/native_client/src/nonsfi/linux/linux_pthread_private.c
index cd5870c..cb93168 100644 (file)
--- a/src/native_client/src/nonsfi/linux/linux_pthread_private.c
+++ b/src/native_client/src/nonsfi/linux/linux_pthread_private.c
@@ -10,6 +10,7 @@
 #include "native_client/src/nonsfi/linux/linux_syscall_structs.h"
 #include "native_client/src/nonsfi/linux/linux_syscall_wrappers.h"
 #include "native_client/src/nonsfi/linux/linux_syscalls.h"
+#include "native_client/src/untrusted/nacl/nacl_irt.h"
 #include "native_client/src/untrusted/nacl/nacl_thread.h"
 #include "native_client/src/untrusted/pthread/pthread_internal.h"
 
@@ -64,8 +65,7 @@ static int nacl_irt_thread_create(void (*start_func)(void), void *stack,
                         * pop the stack to get start_func and call it.
                         */
                        "mov $0, %%ebp\n"
-                       "pop %%eax\n"
-                       "call *%%eax\n"
+                       "call *(%%esp)\n"
                        /* start_func never finishes. */
                        "hlt\n"
                        "0:\n"
@@ -149,11 +149,11 @@ static int nacl_irt_thread_nice(const int nice) {
   return 0;
 }
 
-void __nc_initialize_interfaces(struct nacl_irt_thread *irt_thread) {
+void __nc_initialize_interfaces(void) {
   const struct nacl_irt_thread init = {
     nacl_irt_thread_create,
     nacl_irt_thread_exit,
     nacl_irt_thread_nice,
   };
-  *irt_thread = init;
+  __libnacl_irt_thread = init;
 }