Changeset 3141 in kBuild for trunk/src

Timestamp:

Mar 14, 2018 9:58:32 PM (7 years ago)

Author:

bird

Message:

kmk: linux merge fixes.

Location:

trunk/src/kmk

Files:

• alloccache.c (modified) (1 diff)
• config.h.linux (modified) (2 diffs)
• expreval.c (modified) (1 diff)
• function.c (modified) (1 diff)
• incdep.c (modified) (1 diff)
• job.c (modified) (3 diffs)
• kbuild-object.c (modified) (1 diff)
• kmkbuiltin/append.c (modified) (1 diff)
• kmkbuiltin/kDepObj.c (modified) (2 diffs)
• main.c (modified) (1 diff)

trunk/src/kmk/alloccache.c

@@ -39 +39 @@
 *******************************************************************************/
 #include "makeint.h"
+#include "filedef.h"
 #include "dep.h"
 #include "debug.h"

trunk/src/kmk/config.h.linux

@@ -1 +1 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
+
+/*
+ * bird: Move up this bunch so we can include features.h early.
+ */
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+#include <features.h> /* bird */
+
 
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
@@ -397 +425 @@
 
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
 /* Version number of package */
 #define VERSION "3.82"

trunk/src/kmk/expreval.c

@@ -33 +33 @@
 #include <glob.h>
 
+#include "filedef.h"
 #include "dep.h"
-#include "filedef.h"
 #include "job.h"
 #include "commands.h"

trunk/src/kmk/function.c

@@ -2150 +2150 @@
       struct variable *v = lookup_variable (argv[i], strlen (argv[i]));
 # ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
-      if (v && !v->origin != o_automatic && !v->rdonly_val)
+      if (v && v->origin != o_automatic && !v->rdonly_val)
 # else
-      if (v && !v->origin != o_automatic)
+      if (v && v->origin != o_automatic)
 # endif
         {

trunk/src/kmk/incdep.c

@@ -551 +551 @@
       /* bail out */
 
-      error (f, "%s: read: %s", cur->name, strerror (errno));
+      OSS (error, f, "%s: read: %s", cur->name, strerror (errno));
       incdep_xfree (cur, cur->file_base);
     }
   else
-    error (f, "%s: fstat: %s", cur->name, strerror (errno));
+    OSS (error, f, "%s: fstat: %s", cur->name, strerror (errno));
 
   close (fd);

trunk/src/kmk/job.c

@@ -1085 +1085 @@
   if (!jobserver_tokens)
     ONS (fatal, NILF, "INTERNAL: Freeing child %p (%s) but no tokens left!\n",
-         child, child->file->name);
+         (void *)child, child->file->name);
 
   /* If we're using the jobserver and this child is not the only outstanding
@@ -1174 +1174 @@
 #else
   char **argv;
-# if !defined(__MSDOS__) && !defined(_AMIGA) && !defined(WINDOWS32) && !defined(VMS)
-  char ** volatile volatile_argv;
-  int volatile volatile_flags;
-# endif
 #endif
 
@@ -2800 +2796 @@
   static const char *sh_chars_sh =  "#;\"*?[]&|<>(){}$`^~!";
 # endif  /* HAVE_DOS_PATHS */
-  char*  sh_chars = sh_chars_sh;                                                /* kmk: +_sh */
-  char** sh_cmds = sh_cmds_sh;                                                  /* kmk: +_sh */
+  char const *  sh_chars = sh_chars_sh;                                                /* kmk: +_sh +const */
+  char const * const * sh_cmds = sh_cmds_sh;                                           /* kmk: +_sh +const*2 */
 #endif
 #ifdef KMK
-  static char sh_chars_kash[] = "#;*?[]&|<>(){}$`^~!";                          /* note: no \" - good idea? */
-  static char *sh_cmds_kash[] = {
+  static const char sh_chars_kash[] = "#;*?[]&|<>(){}$`^~!";                          /* note: no \" - good idea? */
+  static const char * const sh_cmds_kash[] = {
       ".", ":", "break", "case", "cd", "continue", "echo", "eval", "exec", "exit", 
       "export", "for", "if", "login", "logout", "read", "readonly", "set", 

trunk/src/kmk/kbuild-object.c

@@ -465 +465 @@
         else
             error(pFileLoc, 20, _("The '$([%.*s...' accessor can only be used in the context of a kBuild object"),
-                  MAX(cchLeft, 20), pchLeft);
+                  (int)MIN(cchLeft, 20), pchLeft);
     }
 

trunk/src/kmk/kmkbuiltin/append.c

@@ -83 +83 @@
     int fVariables = 0;
     int fCommands = 0;
+#ifndef kmk_builtin_append
     int fLookForInserts = 0;
+#endif
 
     g_progname = argv[0];

trunk/src/kmk/kmkbuiltin/kDepObj.c

@@ -601 +601 @@
         if (off + sizeof(*pHdr) >= cbSyms)
         {
-            fprintf(stderr, "%s: CV symbol table entry at %08" KX32_PRI " is too long; cbSyms=%#" KSIZE_PRI "\n",
+            fprintf(stderr, "%s: CV symbol table entry at %08" KX32_PRI " is too long; cbSyms=%#" KX32_PRI "\n",
                     argv0, off, cbSyms);
             return 1; /* FIXME */
@@ -609 +609 @@
         if (off + cbData + sizeof(*pHdr) > cbSyms)
         {
-            fprintf(stderr, "%s: CV symbol table entry at %08" KX32_PRI " is too long; cbData=%#" KX32_PRI " cbSyms=%#" KSIZE_PRI "\n",
+            fprintf(stderr, "%s: CV symbol table entry at %08" KX32_PRI " is too long; cbData=%#" KX32_PRI " cbSyms=%#" KX32_PRI "\n",
                     argv0, off, cbData, cbSyms);
             return 1; /* FIXME */

trunk/src/kmk/main.c

@@ -3233 +3233 @@
          _("warning:  Clock skew detected.  Your build may be incomplete."));
 
-    MAKE_STATS_2(if (uStartTick) printf("main ticks elapsed: %ull\n", (unsigned long long)(CURRENT_CLOCK_TICK() - uStartTick)) );
+    MAKE_STATS_2(if (uStartTick) printf("main ticks elapsed: %llu\n", (unsigned long long)(CURRENT_CLOCK_TICK() - uStartTick)) );
     /* Exit.  */
     die (makefile_status);