source: trunk/System/Sources/libc/patches/patch-linux_amd64_socket.diff @ 442

libc/Makefile

@@ -172 +172 @@
                 $(PACKAGE)-$(VERSION)/src/socket/kernel/linux/Makefile \
                 $(PACKAGE)-$(VERSION)/src/socket/kernel/linux/common.h \
                 $(PACKAGE)-$(VERSION)/src/socket/kernel/linux/project.conf \
+                $(PACKAGE)-$(VERSION)/src/socket/kernel/linux/amd64/Makefile \
+                $(PACKAGE)-$(VERSION)/src/socket/kernel/linux/amd64/syscalls.S \
+                $(PACKAGE)-$(VERSION)/src/socket/kernel/linux/amd64/project.conf \
                 $(PACKAGE)-$(VERSION)/src/socket/kernel/linux/arm/Makefile \
                 $(PACKAGE)-$(VERSION)/src/socket/kernel/linux/arm/syscalls.S \
                 $(PACKAGE)-$(VERSION)/src/socket/kernel/linux/arm/project.conf \

libc/src/socket/syscalls.S

@@ -31 +31 @@
 
 /* Linux */
 #elif defined(__linux__)
-# if defined(__arm__)
+# if defined(__amd64__)
+#  include "kernel/linux/amd64/syscalls.S"
+# elif defined(__arm__)
 #  include "kernel/linux/arm/syscalls.S"
 # elif defined(__i386__)
 #  include "kernel/linux/i386/syscalls.S"

libc/src/socket/kernel/linux/Makefile

@@ -1 @@
-SUBDIRS = arm i386
+SUBDIRS = amd64 arm i386
 
 
 all: subdirs

libc/src/socket/kernel/linux/common.h

@@ -19 +19 @@
 # define SOCKET_KERNEL_LINUX_COMMON_H
 
 
-# define SYS_socket             1
-# define SYS_bind               2
-# define SYS_connect            3
-# define SYS_listen             4
-# define SYS_accept             5
-# define SYS_getsockname        6
-# define SYS_recv               9
-# define SYS_send               10
-# define SYS_sendto             11
-# define SYS_recvfrom           12
-# define SYS_setsockopt         14
-# define SYS_getsockopt         15
-# define SYS_sendmsg            16
-# define SYS_recvmsg            17
-# define SYS_socketcall         102
+# ifdef __amd64__
+#  define SYS_socket            41
+#  define SYS_connect           42
+#  define SYS_accept            43
+#  define SYS_sendto            44
+#  define SYS_recvfrom          45
+#  define SYS_send              46 /* FIXME is this correct? */
+#  define SYS_sendmsg           46
+#  define SYS_recv              47 /* FIXME is this correct? */
+#  define SYS_recvmsg           47
+#  define SYS_shutdown          48
+#  define SYS_bind              49
+#  define SYS_listen            50
+#  define SYS_getsockname       51
+#  define SYS_setsockopt        54
+#  define SYS_getsockopt        55
+# else
+#  define SYS_socket            1
+#  define SYS_bind              2
+#  define SYS_connect           3
+#  define SYS_listen            4
+#  define SYS_accept            5
+#  define SYS_getsockname       6
+#  define SYS_recv              9
+#  define SYS_send              10
+#  define SYS_sendto            11
+#  define SYS_recvfrom          12
+#  define SYS_setsockopt        14
+#  define SYS_getsockopt        15
+#  define SYS_sendmsg           16
+#  define SYS_recvmsg           17
+#  define SYS_socketcall        102
+# endif
 
 #endif /* !KERNEL_SOCKET_LINUX_COMMON_H */

libc/src/socket/kernel/linux/project.conf

@@ -1 @@
-subdirs=arm,i386
+subdirs=amd64,arm,i386
 dist=Makefile,common.h

src/socket/kernel/linux/amd64/Makefile

@@ +1 @@
+
+
+all:
+
+clean:
+
+distclean: clean
+
+install: all
+
+uninstall:
+
+.PHONY: all clean distclean install uninstall

src/socket/kernel/linux/amd64/project.conf

@@ +1 @@
+dist=Makefile,syscalls.S

src/socket/kernel/linux/amd64/syscalls.S

@@ +1 @@
+/* $Id$ */
+/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
+/* This file is part of DeforaOS System libc */
+/* This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+
+
+_syscall:
+        mov     %rcx, %r10
+        syscall
+        jnc     .errnoret
+.errno:
+#ifdef PIC
+        mov     errno@GOTPCREL(%rip), %rcx
+        mov     %rax, (%rcx)
+#else
+        mov     %rax, errno
+#endif
+        mov     $-1, %rax
+.errnoret:
+        ret
+
+
+/* macros */
+#ifdef PIC
+# define SYSCALL(name) \
+.global name; \
+.type name,@function; \
+name:; \
+        mov     $SYS_ ## name, %rax; \
+        jmp     _syscall@PLT
+#else
+# define SYSCALL(name) \
+.global name; \
+.type name,@function; \
+name:; \
+        mov     $SYS_ ## name, %rax; \
+        jmp     _syscall
+#endif