Changeset 3882 for trunk

Timestamp:

Jun 28, 2014, 3:21:46 AM (11 years ago)

Author:

bird

Message:

libc/process building with watcom.

Location:

trunk/libc/src/libc/process

Files:

• Makefile.kmk (modified) (1 diff)
• os2/Makefile.kup (added)
• os2/_errno-os2.c (copied) (copied from trunk/libc/src/libc/process/nt/_errno-nt.c ) (2 diffs)
• os2/threadid.asm (added)

trunk/libc/src/libc/process/Makefile.kmk

@@ -123 +123 @@
 
 libc_libc_process_SOURCES.os2 = \
-    $(PATH_LIBC_SRC)/libc/process/os2/threadid.s \
-    $(PATH_LIBC_SRC)/libc/process/os2/_errno.s \
+    $(PATH_LIBC_SRC)/libc/process/os2/threadid$(KLIBC_SUFF_AS) \
+    $(PATH_LIBC_SRC)/libc/process/os2/_errno-os2.c \
     $(PATH_LIBC_SRC)/libc/process/os2/beginthread-os2.c \
     $(PATH_LIBC_SRC)/libc/process/os2/smutex-os2.c \

trunk/libc/src/libc/process/os2/_errno-os2.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
+ * kLibC - Implementation of _errno() on OS/2.
  *
- * LIBC - _errno(), NT.
- *
- * Copyright (c) 2006 knut st. osmundsen <bird-srcspam@anduin.net>
- *
- *
- * This file is part of kLIBC.
- *
- * kLIBC is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * kLIBC 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with kLIBC; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+ * @copyright   Copyright (C) 2006-2014 knut st. osmundsen <bird-klibc-spam-xiv@anduin.net>
+ * @licenses    MIT, BSD2, BSD3, BSD4, LGPLv2.1, LGPLv3, LGPLvFuture.
  */
 
-
-#include <klibc/nt/nt.h>
-#include <klibc/nt/fib.h>
+#include <klibc/os2/fib.h>
 #include <klibc/thread.h>
 
@@ -33 +13 @@
 int *_errno(void)
 {
-    return &(__libc_threadCurrent()->iErrNo);
+    if (__predict_true(__libc_gpTLS != NULL))
+        return &(__libc_threadCurrent()->iErrNo);
+    static int s_initErrno = 0;
+    return &s_initErrno;
 }