Changeset 3864 for trunk

Timestamp:

Jun 26, 2014, 4:24:05 PM (11 years ago)

Author:

bird

Message:

Use genalias for the libsocket aliases; make libsocket build with watcom.

Location:

trunk/libc

Files:

• Config.kmk (modified) (4 diffs)
• alias.kmk (modified) (1 diff)
• include/klibc/asmdefs.mac (added)
• include/klibc/os2/asmdefs.mac (modified) (1 diff)
• klibc_alias.kmk (added)
• src/libsocket/386/Makefile.kup (added)
• src/libsocket/386/swapl.asm (added)
• src/libsocket/386/swaps.asm (added)
• src/libsocket/Makefile.kmk (modified) (2 diffs)
• src/libsocket/aliases (deleted)

trunk/libc/Config.kmk

@@ -31 +31 @@
 # Undo the packing pass the toplevel config insists on.
 DEFAULT_PASSES := $(filter-out PACKING,$(DEFAULT_PASSES))
+
+# For finding the klibc_alias unit.
+KBUILD_UNIT_PATHS := $(KBUILD_UNIT_PATHS) $(PATH_ROOT)/libc
+
 
 #
@@ -74 +78 @@
 ifdef LIBC_GENALIAS_FORMAT.$(BUILD_TARGET)
  LIBC_GENALIAS_FORMAT := $(LIBC_GENALIAS_FORMAT.$(BUILD_TARGET))
+else ifdef CFG_LIBC_USE_WATCOM
+ LIBC_GENALIAS_FORMAT := omf
 else
  LIBC_GENALIAS_FORMAT := aout
@@ -95 +101 @@
  TEMPLATE_libc_ASTOOL  = $(TEMPLATE_libcasm_ASTOOL)
  TEMPLATE_libc_ASFLAGS = $(TEMPLATE_libcasm_ASFLAGS)
+ KLIBC_SUFF_AS = .asm
 else
  TEMPLATE_libc_TOOL = GCC3
@@ -100 +107 @@
  TEMPLATE_libc_CFLAGS.os2 = $(TEMPLATE_lib_CFLAGS.os2) -mstack-arg-probe
  TEMPLATE_libc_CFLAGS.release = $(TEMPLATE_lib_CFLAGS.release) -O3 -mcpu=pentium
+ KLIBC_SUFF_AS = .s
 endif
 

trunk/libc/alias.kmk

@@ -38 +38 @@
 #
 # The generated source and object files.
-# The installation is done manually by Makefile.kmk. Yea, it's a hack sorts...
+# The installation is done manually by Makefile.kmk. Yea, it's a hack of sorts...
 #
 libc_alias_TOOL = GCC3

trunk/libc/include/klibc/os2/asmdefs.mac

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; NASM assembly definitions for kLibC.
+; NASM assembly definitions for kLibC, OS/2 variant.
 ;
 ; @copyright   Copyright (C) 2004-2014 knut st. osmundsen <bird-klibc-spam-xiv@anduin.net>

trunk/libc/src/libsocket/Makefile.kmk

@@ -70 +70 @@
 
 libc_libsocket_SOURCES.x86 = \
-        $(PATH_LIBC_SRC)/libsocket/386/swapl.s \
-        $(PATH_LIBC_SRC)/libsocket/386/swaps.s \
+        $(PATH_LIBC_SRC)/libsocket/386/swapl$(KLIBC_SUFF_AS) \
+        $(PATH_LIBC_SRC)/libsocket/386/swaps$(KLIBC_SUFF_AS) \
 
-libc_libsocket_SOURCES.os2 = \
-        $(PATH_LIBC_SRC)/libsocket/aliases/accept-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/bind-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/bsdselect-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/connect-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/getpeername-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/getsockname-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/getsockopt-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/inetaddr-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/inetnetw-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/listen-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/os2_ioctl-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/os2_select-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/recv-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/recvfrom-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/recvmsg-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/send-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/sendmsg-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/sendto-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/setsockopt-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/shutdown-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/soabort-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/socket-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/socketops-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/socketpair-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/sock_errno-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/soclose-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/so_cancel-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/so_ioctl-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/so_readv-alias.s \
-        $(PATH_LIBC_SRC)/libsocket/aliases/so_writev-alias.s \
+libc_libsocket_USES += klibc_alias
+libc_libsocket_KLIBC_ALIASES.os2 = \
+        accept=_accept \
+        bind=_bind \
+        _bsdselect=bsdselect \
+        connect=_connect \
+        getpeername=_getpeername \
+        getsockname=_getsockname \
+        getsockopt=_getsockopt \
+        herror=_herror \
+        inetaddr=_inetaddr \
+        inetnetw=_inetnetw \
+        listen=_listen \
+        os2_ioctl=_os2_ioctl \
+        _os2_select=os2_select \
+        recv=_recv \
+        recvfrom=_recvfrom \
+        recvmsg=_recvmsg \
+        send=_send \
+        sendmsg=_sendmsg \
+        sendto=_sendto \
+        setsockopt=_setsockopt \
+        shutdown=_shutdown \
+        soabort=_soabort \
+        socket=_socket \
+        socketops=_socketops \
+        socketpair=_socketpair \
+        sock_errno=_sock_errno \
+        soclose=_soclose \
+        so_cancel=_so_cancel \
+        so_ioctl=_so_ioctl \
+        so_readv=_so_readv \
+        so_writev=_so_writev
 
 # configure the variants. */
@@ -123 +125 @@
 
 libc_libsocketv4_SOURCES.os2 = \
-        $(libc_libsocket_SOURCES.os2) \
-        $(PATH_LIBC_SRC)/libsocket/aliases/herror-alias.s \
+        $(libc_libsocket_SOURCES.os2)
+
+libc_libsocketv4_USES += klibc_alias
+libc_libsocketv4_KLIBC_ALIASES.os2 = \
+        $(libc_libsocket_KLIBC_ALIASES.os2) \
+       herror=_herror
+
 
 # configure the variants. */