Changeset 3820

Timestamp:

Feb 26, 2014, 1:44:45 AM (11 years ago)

Author:

bird

Message:

Slowly starting to make it build with non GCC compilers, first out is OpenWatcom.

Location:

trunk

Files:

• Config.kmk (modified) (7 diffs)
• libc/Config.kmk (modified) (5 diffs)
• libc/include/386/builtin.h (modified) (1 diff)
• libc/include/386/signal.h (modified) (1 diff)
• libc/include/sys/cdefs.h (modified) (3 diffs)
• libc/src/fbsdlibc/db/db/db.c (modified) (1 diff)
• libc/src/fbsdlibc/db/recno/rec_close.c (modified) (2 diffs)
• libc/src/fbsdlibc/gdtoa/gdtoaimp.h (modified) (7 diffs)
• libc/src/genalias/genalias.c (modified) (3 diffs)
• libc/src/libc/conv/makepow5.c (modified) (3 diffs)

trunk/Config.kmk ¶

@@ -1 +1 @@
 # $Id$
 ## @file
-#
 # Top-level kBuild configuration.
 #
-# Copyright (c) 2006 knut st. osmundsen <bird@anduin.net>
+
+#
+# Copyright (c) 2006-2014 knut st. osmundsen <bird@anduin.net>
 #
 #
@@ -37 +38 @@
 
 #
+# Base template.
+#
+TEMPLATE_kNIX-base = Base template.
+ifdef CFG_USE_WATCOM
+ TEMPLATE_kNIX-base_TOOL = OPENWATCOM
+ TEMPLATE_kNIX-base_CFLAGS = -za99
+else
+ TEMPLATE_kNIX-base_TOOL = GCC3
+ TEMPLATE_kNIX-base_TOOL.os2 = GCC3OMF
+endif
+
+
+#
 # The /bin templates.
 #
 TEMPLATE_bin = /bin/ programs.
-TEMPLATE_bin_TOOL = GCC3
-TEMPLATE_bin_TOOL.os2 = GCC3OMF
+TEMPLATE_bin_EXTENDS = kNIX-base
 TEMPLATE_bin_INST = bin/
 
@@ -48 +61 @@
 #
 TEMPLATE_usr.bin = /usr/bin/ programs.
-TEMPLATE_usr.bin_TOOL = GCC3
-TEMPLATE_usr.bin_TOOL.os2 = GCC3OMF
+TEMPLATE_usr.bin_EXTENDS = kNIX-base
 TEMPLATE_usr.bin_INST = usr/bin/
 
@@ -66 +78 @@
 
 TEMPLATE_usr.bin.alp = /usr/bin/ libraries using alp as assembler.
-TEMPLATE_usr.bin.alp_TOOL = GCC3
-TEMPLATE_usr.bin.alp_TOOL.os2 = GCC3OMF
+TEMPLATE_usr.bin.alp_EXTENDS = kNIX-base
 TEMPLATE_usr.bin.alp_ASTOOL = ALP
 TEMPLATE_usr.bin.alp_ASFLAGS = -Sv:ALP
@@ -73 +84 @@
 
 TEMPLATE_usr.bin.nasm = /usr/lib/ libraries using nasm as assembler.
-TEMPLATE_usr.bin.nasm_TOOL = GCC3
-TEMPLATE_usr.bin.nasm_TOOL.os2 = GCC3OMF
+TEMPLATE_usr.bin.nasm_EXTENDS = kNIX-base
 TEMPLATE_usr.bin.nasm_ASTOOL = NASM
 TEMPLATE_usr.bin.nasm_ASFLAGS = -f obj
@@ -83 +93 @@
 #
 TEMPLATE_usr.sbin = /usr/sbin/ programs.
-TEMPLATE_usr.sbin_TOOL = GCC3
-TEMPLATE_usr.sbin_TOOL.os2 = GCC3OMF
+TEMPLATE_usr.sbin_EXTENDS = kNIX-base
 TEMPLATE_usr.sbin_INST = usr/sbin/
 
@@ -117 +126 @@
 #
 TEMPLATE_usr.lib = /usr/lib/ libraries.
-TEMPLATE_usr.lib_TOOL = GCC3
-TEMPLATE_usr.lib_TOOL.os2 = GCC3OMF
+TEMPLATE_usr.lib_EXTENDS = kNIX-base
 TEMPLATE_usr.lib_INST = usr/lib/
 TEMPLATE_usr.lib_MODE = 644
 
 TEMPLATE_usr.lib.nasm = /usr/lib/ libraries using nasm as assembler.
-TEMPLATE_usr.lib.nasm_TOOL = GCC3
-TEMPLATE_usr.lib.nasm_TOOL.os2 = GCC3OMF
+TEMPLATE_usr.lib.nasm_EXTENDS = kNIX-base
 TEMPLATE_usr.lib.nasm_ASTOOL = NASM
 TEMPLATE_usr.lib.nasm_ASFLAGS = -f obj

trunk/libc/Config.kmk ¶

@@ -60 +60 @@
 #
 PATH_LIBC_ROOT = $(PATH_ROOT)/libc
-PATH_LIBC_SRC = $(PATH_LIBC_ROOT)/src
-PATH_LIBC_INC = $(PATH_LIBC_ROOT)/include
+PATH_LIBC_SRC  = $(PATH_LIBC_ROOT)/src
+PATH_LIBC_INC  = $(PATH_LIBC_ROOT)/include
+
 LIBC-STD.H = $(PATH_OBJ)/libc/libc-std.h
 LIBC_GENALIAS = $(PATH_TARGET)/genalias/genalias$(HOSTSUFF_EXE)
 LIBC_GENALIAS_FORMAT.nt = coff
 ifdef LIBC_GENALIAS_FORMAT.$(BUILD_TARGET)
-LIBC_GENALIAS_FORMAT := $(LIBC_GENALIAS_FORMAT.$(BUILD_TARGET))
-else
-LIBC_GENALIAS_FORMAT := aout
+ LIBC_GENALIAS_FORMAT := $(LIBC_GENALIAS_FORMAT.$(BUILD_TARGET))
+else
+ LIBC_GENALIAS_FORMAT := aout
 endif
 
@@ -74 +75 @@
 # Templates
 #
-TEMPLATE_libc = libc template
-TEMPLATE_libc_TOOL = GCC3
+TEMPLATE_libc = libc template
+TEMPLATE_libc_DEPS = $(LIBC-STD.H)
+TEMPLATE_libc_INST = usr/lib/
 TEMPLATE_libc_INCS = $(PATH_LIBC_INC) $(dir $(LIBC-STD.H))
 TEMPLATE_libc_INCS.nt = $(PATH_LIBC_SRC)/w32api/include
-TEMPLATE_libc_DEPS = $(LIBC-STD.H)
-TEMPLATE_libc_INST = usr/lib/
-TEMPLATE_libc_CFLAGS = $(TEMPLATE_lib_CFLAGS) -std=gnu99 -Wall -Wundef -Wmissing-prototypes
-TEMPLATE_libc_CFLAGS.os2 = $(TEMPLATE_lib_CFLAGS.os2) -mstack-arg-probe
-TEMPLATE_libc_CFLAGS.release = $(TEMPLATE_lib_CFLAGS.release) -O3 -mcpu=pentium
+if defined(CFG_LIBC_USE_WATCOM) || defined(CFG_KNIX_USE_WATCOM)
+ TEMPLATE_libc_TOOL = OPENWATCOM
+ TEMPLATE_libc_CFLAGS = $(TEMPLATE_lib_CFLAGS)
+ TEMPLATE_libc_CFLAGS.os2 = $(TEMPLATE_lib_CFLAGS.os2)
+ TEMPLATE_libc_CFLAGS.release = $(TEMPLATE_lib_CFLAGS.release)
+else
+ TEMPLATE_libc_TOOL = GCC3
+ TEMPLATE_libc_CFLAGS = $(TEMPLATE_lib_CFLAGS) -std=gnu99 -Wall -Wundef -Wmissing-prototypes
+ TEMPLATE_libc_CFLAGS.os2 = $(TEMPLATE_lib_CFLAGS.os2) -mstack-arg-probe
+ TEMPLATE_libc_CFLAGS.release = $(TEMPLATE_lib_CFLAGS.release) -O3 -mcpu=pentium
+endif
 
 TEMPLATE_libc.logstrict = .
@@ -110 +118 @@
 
 TEMPLATE_libcasm = .
-TEMPLATE_libcasm_TOOL = GCC3
-TEMPLATE_libcasm_TOOL.os2 = GCC3OMF
+if defined(CFG_LIBC_USE_WATCOM) || defined(CFG_KNIX_USE_WATCOM)
+ TEMPLATE_libcasm_TOOL = OPENWATCOM
+else
+ TEMPLATE_libcasm_TOOL = GCC3
+ TEMPLATE_libcasm_TOOL.os2 = GCC3OMF
+endif
 TEMPLATE_libcasm_INCS = $(PATH_LIBC_INC) $(dir $(LIBC-STD.H))
 TEMPLATE_libcasm_INST = usr/lib/
@@ -147 +159 @@
 # Only permit #include <include/emx/bigint.h>.
 TEMPLATE_bldprog = Build programs
-TEMPLATE_bldprog_TOOL = GCC3
 TEMPLATE_bldprog_DEFS = __LIBC_BUILD_PROGRAM__
-TEMPLATE_bldprog_INCS = $(PATH_LIBC_ROOT)
+if defined(CFG_LIBC_USE_WATCOM) || defined(CFG_KNIX_USE_WATCOM)
+ TEMPLATE_bldprog_TOOL = OPENWATCOM
+ TEMPLATE_bldprog_INCS = $(TOOL_OPENWATCOM_CXXINCS) $(PATH_LIBC_ROOT)
+ TEMPLATE_bldprog_BLD_TRG_ARCH = x86
+ TEMPLATE_bldprog_CFLAGS = -za99
+else
+ TEMPLATE_bldprog_TOOL = GCC3
+ TEMPLATE_bldprog_INCS = $(PATH_LIBC_ROOT)
+endif
 
 
@@ -205 +224 @@
 $(1)_p_SOURCES.$(BUILD_TARGET_CPU) = $($(1)_SOURCES.$(BUILD_TARGET_CPU))
 endif # CFG_LIBC_PROFILED_LIBS
-endef
+endef # def_libc_variants
 
 define def_libc_variants2

trunk/libc/include/386/builtin.h ¶

@@ -16 +16 @@
                                        signed char v)
 {
+#ifdef __WATCOMC__
+  /** @todo next up */
+#else
   __asm__ __volatile__ ("xchgb %0, %1" : "=m"(*p), "=r"(v) : "1"(v));
+#endif
   return v;
 }

trunk/libc/include/386/signal.h ¶

@@ -131 +131 @@
         int     sc_fpformat;
         int     sc_ownedfp;
-        int     sc_spare1[1];
+        int     sc_spare1[1+1]; /* bird: added one int here to get the desire alignment.*/
+#ifdef __GNUC__ /* bird */
         int     sc_fpstate[128] __aligned(16);
+#else
+        int     sc_fpstate[128];
+#endif
         int     sc_spare2[8];
 };
+
+_Static_assert(!(__offsetof(struct sigcontext, sc_fpstate) & 15),); /* bird */
+
 
 #define sc_sp           sc_esp

trunk/libc/include/sys/cdefs.h ¶

@@ -8 +8 @@
  * @changed bird: __offsetof__ was apparently introduced in gcc 3.4.x.
  */
-
+ 
 /*-
  * Copyright (c) 1991, 1993
@@ -126 +126 @@
 
 /*
+ * Compiler checks for MSC and OpenWatcom. (bird)
+ */
+#ifdef __WATCOMC__
+# define __KLIBC_WATCOM_PREREQ(ma, mi)  (__WATCOMC__ >= (ma)*10 + (mi))
+#else
+# define __KLIBC_WATCOM_PREREQ(ma, mi)  0
+#endif
+
+#ifdef _MSC_VER
+# define __KLIBC_MSVC_PREREQ(ma, mi)    (_MSC_VER >= (ma)*100 + (mi)*10)
+#else
+# define __KLIBC_MSVC_PREREQ(ma, mi)    0
+#endif
+/* bird - end: Compiler checks for MSC and OpenWatcom. */
+
+/*
  * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
  * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
@@ -318 +334 @@
 
 /* XXX: should use `#if __STDC_VERSION__ < 199901'. */
-#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
+#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER) && !defined(__WATCOMC__) /* bird: Watcom */
 #define __func__        NULL
 #endif

trunk/libc/src/fbsdlibc/db/db/db.c ¶

@@ -57 +57 @@
 
 #define DB_FLAGS        (DB_LOCK | DB_SHMEM | DB_TXN)
-#ifdef __EMX__ /* TODO: add the missing flags! */
+#ifdef __IN_KLIBC__ /* TODO: add the missing flags! */
 #define USE_OPEN_FLAGS                                                  \
         (O_CREAT | O_EXCL /*| O_EXLOCK*/ | O_NONBLOCK | O_RDONLY |              \

trunk/libc/src/fbsdlibc/db/recno/rec_close.c ¶

@@ -41 +41 @@
 #include <sys/types.h>
 #include <sys/uio.h>
-#ifndef __EMX__
+#if !defined(__IN_KLIBC__) || !defined(__OS2__)
 #include <sys/mman.h>
 #endif
@@ -83 +83 @@
         /* Committed to closing. */
         status = RET_SUCCESS;
-#ifndef __EMX__
+#if !defined(__IN_KLIBC__) || !defined(__OS2__)
         if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize))
                 status = RET_ERROR;

trunk/libc/src/fbsdlibc/gdtoa/gdtoaimp.h ¶

@@ -178 +178 @@
 #ifndef GDTOAIMP_H_INCLUDED
 #define GDTOAIMP_H_INCLUDED
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 #include "namespace.h"
 #endif
@@ -194 +194 @@
 
 #include "namespace.h"
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 #include <386/builtin.h>
 #include <sys/fmutex.h>
-#else /* !__EMX__ */
+#else /* !__IN_KLIBC__ */
 #include <pthread.h>
-#endif /* !__EMX__ */
+#endif /* !__IN_KLIBC__ */
 #include "un-namespace.h"
 
@@ -478 +478 @@
 
 #define MULTIPLE_THREADS
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 extern _fmutex __libc_gdtoa_locks[2];
 #define ACQUIRE_DTOA_LOCK(n)    do {                            \
@@ -488 +488 @@
     _fmutex_checked_release(&__libc_gdtoa_locks[n]);                 \
 } while(0)
-#else /* !__EMX__ */
+#else /* !__IN_KLIBC__ */
 extern pthread_mutex_t __gdtoa_locks[2];
 #define ACQUIRE_DTOA_LOCK(n)    do {                            \
@@ -498 +498 @@
                 _pthread_mutex_unlock(&__gdtoa_locks[n]);       \
 } while(0)
-#endif /* !__EMX__ */
+#endif /* !__IN_KLIBC__ */
 
 #define Kmax 15
@@ -651 +651 @@
  extern int strtodg ANSI((CONST char*, char**, FPI*, Long*, ULong*));
 
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
  extern char*   g_ddfmt  ANSI((char*, double*, int, unsigned));
  extern char*   g_dfmt   ANSI((char*, double*, int, unsigned));
@@ -658 +658 @@
  extern char*   g_xfmt   ANSI((char*, void*,   int, unsigned));
  extern char*   g_xLfmt  ANSI((char*, void*,   int, unsigned));
-#endif /* __EMX__ */
+#endif /* __IN_KLIBC__ */
 
  extern int strtoId ANSI((CONST char *, char **, double *, double *));

trunk/libc/src/genalias/genalias.c ¶

@@ -1 +1 @@
 /* $Id: $ */
 /** @file
- *
  * genalias - generate a number of alias objects.
- *
- * Copyright (c) 2006 knut st. osmundsen <bird@innotek.de>
+ */
+
+/*
+ * Copyright (c) 2006-2014 knut st. osmundsen <bird@innotek.de>
  *
  *
@@ -32 +33 @@
 #include <stdio.h>
 #include <stdint.h>
+#include <string.h>
 #include <time.h>
 #include <assert.h>
@@ -188 +190 @@
 #define IMAGE_WEAK_EXTERN_SEARCH_ALIAS 3
     assert(sizeof(Hdr) == 20); assert(sizeof(Sym) == 18); assert(sizeof(Aux) == sizeof(Sym));
-#pragma pack()
+#pragma pack(0)
     const size_t cchAlias = strlen(pszAlias);
     const size_t cchReal = strlen(pszReal);

trunk/libc/src/libc/conv/makepow5.c ¶

@@ -3 +3 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <getopt.h>
+#include <string.h>
 #include "include/emx/bigint.h"
 
@@ -25 +25 @@
 
 
-static void usage (void)
+static int usage (void)
 {
   puts ("makepow5 -- Copyright (c) 1996 by Eberhard Mattes\n");
   puts ("Usage:");
   puts ("  makepow5 [-o <output_file>] [-s] [-m <threshold>] <max_exponent>");
-  exit (1);
+  return 1;
 }
 
@@ -238 +238 @@
 int main (int argc, char *argv[])
 {
-  int c;
+  int iArg;
   char *end;
 
-  while ((c = getopt (argc, argv, "m:o:s")) != -1)
-    switch (c)
+  for (iArg = 1; iArg < argc; iArg++)
+    if (argv[iArg][0] != '-')
       {
-      case 'm':
-        long_mul_threshold = strtol (optarg, &end, 10);
-        if (long_mul_threshold < 1 || *end != 0)
-          usage ();
-        break;
-
-      case 'o':
-        out_fname = optarg;
-        break;
-
-      case 's':
-        single_prec = 1;
-        break;
-
-      default:
-        usage ();
+        if (max_exponent)
+          return usage ();
+        max_exponent = strtol (argv[iArg], &end, 10);
+        if (max_exponent < 1 || *end != 0)
+          return usage ();
       }
-
-  if (argc - optind != 1)
-    usage ();
-
-  max_exponent = strtol (argv[optind], &end, 10);
-  if (max_exponent < 1 || *end != 0)
-    usage ();
+    else
+      {
+        int    c = argv[iArg][1];
+        char *optarg = NULL;
+
+        if (strchr (c, "ms"))
+          {
+            if (   argv[iArg][2] == ':'
+                || argv[iArg][2] == '=')
+              optarg = &argv[iArg][3];
+            else if (iArg + 1 >= argc)
+              return usage ();
+            else
+              optarg = argv[++iArg];
+          }
+
+        switch (c)
+            {
+            case 'm':
+              {
+                long_mul_threshold = strtol (optarg, &end, 10);
+                if (long_mul_threshold < 1 || *end != 0)
+                  return usage ();
+                break;
+              }
+
+            case 'o':
+              out_fname = optarg;
+              break;
+
+            case 's':
+              single_prec = 1;
+              break;
+
+            default:
+              return usage ();
+            }
+      }
 
   compute_all_powers ();