Changeset 342 for asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/thread

Timestamp:

Apr 27, 2018, 2:26:14 PM (6 years ago)

Author:

coas-nagasima

Message:

syscallが関数呼びになるよう変更
他更新

Location:

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/thread

Files:

• __syscall_cp.c (modified) (2 diffs)
• pthread_cancel.c (modified) (1 diff)

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/thread/__syscall_cp.c

@@ -2 +2 @@
 #include "syscall.h"
 
+#undef sccp
 __attribute__((__visibility__("hidden")))
 long __syscall_cp_c();
@@ -9 +10 @@
                  syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
 {
-        return (__syscall)(nr, u, v, w, x, y, z);
+        return (__syscall_nr)(nr, u, v, w, x, y, z);
 }
 
 #ifndef __c2__
 weak_alias(sccp, __syscall_cp_c);
+#else
+long __syscall_cp_c(syscall_arg_t nr,
+        syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
+        syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
+{
+        return sccp(nr, u, v, w, x, y, z);
+}
 #endif
 

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/thread/pthread_cancel.c

@@ -31 +31 @@
         if ((st=(self=__pthread_self())->canceldisable)
             && (st==PTHREAD_CANCEL_DISABLE || nr==SYS_close))
-                return __syscall(nr, u, v, w, x, y, z);
+                return __syscall_nr(nr, u, v, w, x, y, z);
 
         r = __syscall_cp_asm(&self->cancel, nr, u, v, w, x, y, z);