Changeset 3140 in kBuild for trunk/src/kmk/rule.c

Timestamp:

Mar 14, 2018 9:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• rule.c (modified) (22 diffs)

trunk/src/kmk/rule.c

@@ -1 +1 @@
 /* Pattern and suffix rule internals for GNU Make.
-Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-2010 Free Software Foundation, Inc.
+Copyright (C) 1988-2016 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
@@ -17 +15 @@
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
 
 #include <assert.h>
 
+#include "filedef.h"
 #include "dep.h"
-#include "filedef.h"
 #include "job.h"
 #include "commands.h"
@@ -75 +73 @@
   char *name;
   int namelen;
-  struct rule *rule, *lastrule;
+  struct rule *rule;
 
   num_pattern_rules = max_pattern_targets = max_pattern_deps = 0;
@@ -83 +81 @@
   namelen = 0;
   rule = pattern_rules;
-  lastrule = 0;
   while (rule != 0)
     {
@@ -93 +90 @@
 
       if (rule->num > max_pattern_targets)
-        max_pattern_targets = rule->num;
+        max_pattern_targets = rule->num;
 
       for (dep = rule->deps; dep != 0; dep = dep->next)
-        {
+        {
           const char *dname = dep_name (dep);
           unsigned int len = strlen (dname);
@@ -112 +109 @@
           ndeps++;
 
-          if (len > max_pattern_dep_length)
-            max_pattern_dep_length = len;
-
-          if (p != 0 && p2 > p)
-            {
-              /* There is a slash before the % in the dep name.
-                 Extract the directory name.  */
-              if (p == dname)
-                ++p;
-              if (p - dname > namelen)
-                {
-                  namelen = p - dname;
-                  name = xrealloc (name, namelen + 1);
-                }
-              memcpy (name, dname, p - dname);
-              name[p - dname] = '\0';
-
-              /* In the deps of an implicit rule the `changed' flag
-                 actually indicates that the dependency is in a
-                 nonexistent subdirectory.  */
-
-              dep->changed = !dir_file_exists_p (name, "");
-            }
-          else
-            /* This dependency does not reside in a subdirectory.  */
-            dep->changed = 0;
-        }
+          if (len > max_pattern_dep_length)
+            max_pattern_dep_length = len;
+
+          if (p != 0 && p2 > p)
+            {
+              /* There is a slash before the % in the dep name.
+                 Extract the directory name.  */
+              if (p == dname)
+                ++p;
+              if (p - dname > namelen)
+                {
+                  namelen = p - dname;
+                  name = xrealloc (name, namelen + 1);
+                }
+              memcpy (name, dname, p - dname);
+              name[p - dname] = '\0';
+
+              /* In the deps of an implicit rule the 'changed' flag
+                 actually indicates that the dependency is in a
+                 nonexistent subdirectory.  */
+
+              dep->changed = !dir_file_exists_p (name, "");
+            }
+          else
+            /* This dependency does not reside in a subdirectory.  */
+            dep->changed = 0;
+        }
 
       if (ndeps > max_pattern_deps)
-        max_pattern_deps = ndeps;
-
-      lastrule = rule;
+        max_pattern_deps = ndeps;
+
       rule = next;
     }
 
-  if (name != 0)
-    free (name);
+  free (name);
 }
 
@@ -155 +150 @@
    TARGET is the target suffix; SOURCE is the source suffix.
    CMDS are the commands.
-   If TARGET is nil, it means the target pattern should be `(%.o)'.
+   If TARGET is nil, it means the target pattern should be '(%.o)'.
    If SOURCE is nil, it means there should be no deps.  */
 
@@ -170 +165 @@
   if (target == 0)
     {
-      /* Special case: TARGET being nil means we are defining a `.X.a' suffix
-         rule; the target pattern is always `(%.o)'.  */
+      /* Special case: TARGET being nil means we are defining a '.X.a' suffix
+         rule; the target pattern is always '(%.o)'.  */
 #ifdef VMS
       *names = strcache_add_len ("(%.obj)", 7);
@@ -225 +220 @@
       unsigned int l = strlen (dep_name (d));
       if (l > maxsuffix)
-        maxsuffix = l;
+        maxsuffix = l;
     }
 
@@ -236 +231 @@
 
       /* Make a rule that is just the suffix, with no deps or commands.
-         This rule exists solely to disqualify match-anything rules.  */
+         This rule exists solely to disqualify match-anything rules.  */
       convert_suffix_rule (dep_name (d), 0, 0);
 
       if (d->file->cmds != 0)
-        /* Record a pattern for this suffix's null-suffix rule.  */
-        convert_suffix_rule ("", dep_name (d), d->file->cmds);
+        /* Record a pattern for this suffix's null-suffix rule.  */
+        convert_suffix_rule ("", dep_name (d), d->file->cmds);
 
       /* Add every other suffix to this one and see if it exists as a
@@ -249 +244 @@
 
       for (d2 = suffix_file->deps; d2 != 0; d2 = d2->next)
-        {
+        {
           struct file *f;
           unsigned int s2len;
 
-          s2len = strlen (dep_name (d2));
+          s2len = strlen (dep_name (d2));
 
           /* Can't build something from itself.  */
-          if (slen == s2len && streq (dep_name (d), dep_name (d2)))
-            continue;
-
-          memcpy (rulename + slen, dep_name (d2), s2len + 1);
-          f = lookup_file (rulename);
-          if (f == 0 || f->cmds == 0)
-            continue;
-
-          if (s2len == 2 && rulename[slen] == '.' && rulename[slen + 1] == 'a')
-            /* A suffix rule `.X.a:' generates the pattern rule `(%.o): %.X'.
-               It also generates a normal `%.a: %.X' rule below.  */
-            convert_suffix_rule (NULL, /* Indicates `(%.o)'.  */
-                                 dep_name (d),
-                                 f->cmds);
-
-          /* The suffix rule `.X.Y:' is converted
-             to the pattern rule `%.Y: %.X'.  */
-          convert_suffix_rule (dep_name (d2), dep_name (d), f->cmds);
-        }
+          if (slen == s2len && streq (dep_name (d), dep_name (d2)))
+            continue;
+
+          memcpy (rulename + slen, dep_name (d2), s2len + 1);
+          f = lookup_file (rulename);
+          if (f == 0 || f->cmds == 0)
+            continue;
+
+          if (s2len == 2 && rulename[slen] == '.' && rulename[slen + 1] == 'a')
+            /* A suffix rule '.X.a:' generates the pattern rule '(%.o): %.X'.
+               It also generates a normal '%.a: %.X' rule below.  */
+            convert_suffix_rule (NULL, /* Indicates '(%.o)'.  */
+                                 dep_name (d),
+                                 f->cmds);
+
+          /* The suffix rule '.X.Y:' is converted
+             to the pattern rule '%.Y: %.X'.  */
+          convert_suffix_rule (dep_name (d2), dep_name (d), f->cmds);
+        }
     }
 }
@@ -302 +297 @@
     for (i = 0; i < rule->num; ++i)
       {
-        for (j = 0; j < r->num; ++j)
-          if (!streq (rule->targets[i], r->targets[j]))
-            break;
+        for (j = 0; j < r->num; ++j)
+          if (!streq (rule->targets[i], r->targets[j]))
+            break;
         /* If all the targets matched...  */
-        if (j == r->num)
-          {
-            struct dep *d, *d2;
-            for (d = rule->deps, d2 = r->deps;
-                 d != 0 && d2 != 0; d = d->next, d2 = d2->next)
-              if (!streq (dep_name (d), dep_name (d2)))
-                break;
-            if (d == 0 && d2 == 0)
-              {
-                /* All the dependencies matched.  */
-                if (override)
-                  {
-                    /* Remove the old rule.  */
-                    freerule (r, lastrule);
-                    /* Install the new one.  */
-                    if (pattern_rules == 0)
-                      pattern_rules = rule;
-                    else
-                      last_pattern_rule->next = rule;
-                    last_pattern_rule = rule;
-
-                    /* We got one.  Stop looking.  */
-                    goto matched;
-                  }
-                else
-                  {
-                    /* The old rule stays intact.  Destroy the new one.  */
-                    freerule (rule, (struct rule *) 0);
-                    return 0;
-                  }
-              }
-          }
+        if (j == r->num)
+          {
+            struct dep *d, *d2;
+            for (d = rule->deps, d2 = r->deps;
+                 d != 0 && d2 != 0; d = d->next, d2 = d2->next)
+              if (!streq (dep_name (d), dep_name (d2)))
+                break;
+            if (d == 0 && d2 == 0)
+              {
+                /* All the dependencies matched.  */
+                if (override)
+                  {
+                    /* Remove the old rule.  */
+                    freerule (r, lastrule);
+                    /* Install the new one.  */
+                    if (pattern_rules == 0)
+                      pattern_rules = rule;
+                    else
+                      last_pattern_rule->next = rule;
+                    last_pattern_rule = rule;
+
+                    /* We got one.  Stop looking.  */
+                    goto matched;
+                  }
+                else
+                  {
+                    /* The old rule stays intact.  Destroy the new one.  */
+                    freerule (rule, (struct rule *) 0);
+                    return 0;
+                  }
+              }
+          }
       }
 
@@ -346 +341 @@
       /* There was no rule to replace.  */
       if (pattern_rules == 0)
-        pattern_rules = rule;
+        pattern_rules = rule;
       else
-        last_pattern_rule->next = rule;
+        last_pattern_rule->next = rule;
       last_pattern_rule = rule;
     }
@@ -359 +354 @@
    in the structure P points to.  These strings come from one of
    the arrays of default implicit pattern rules.
-   TERMINAL specifies what the `terminal' field of the rule should be.  */
+   TERMINAL specifies what the 'terminal' field of the rule should be.  */
 
 void
@@ -365 +360 @@
 {
   struct rule *r;
-  char *ptr;
+  const char *ptr;
 
   r = xmalloc (sizeof (struct rule));
@@ -381 +376 @@
 
   ptr = p->dep;
-  r->deps = PARSE_FILE_SEQ (&ptr, struct dep, '\0', NULL, 0);
+  r->deps = PARSE_SIMPLE_SEQ ((char **)&ptr, struct dep);
 
   if (new_pattern_rule (r, 0))
@@ -393 +388 @@
       r->cmds->fileinfo.filenm = 0;
       r->cmds->fileinfo.lineno = 0;
+      r->cmds->fileinfo.offset = 0;
       /* These will all be string literals, but we malloc space for them
-         anyway because somebody might want to free them later.  */
+         anyway because somebody might want to free them later.  */
       r->cmds->commands = xstrdup (p->commands);
       r->cmds->command_lines = 0;
+      r->cmds->recipe_prefix = RECIPEPREFIX_DEFAULT;
+
 #ifdef CONFIG_WITH_MEMORY_OPTIMIZATIONS
       r->cmds->refs = 1000;
@@ -423 +421 @@
      are ways that they could be in more than one place:
        * If the commands came from a suffix rule, they could also be in
-       the `struct file's for other suffix rules or plain targets given
+       the 'struct file's for other suffix rules or plain targets given
        on the same makefile line.
        * If two suffixes that together make a two-suffix rule were each
        given twice in the .SUFFIXES list, and in the proper order, two
        identical pattern rules would be created and the second one would
-       be discarded here, but both would contain the same `struct commands'
-       pointer from the `struct file' for the suffix rule.  */
+       be discarded here, but both would contain the same 'struct commands'
+       pointer from the 'struct file' for the suffix rule.  */
 
   free (rule);
@@ -488 +486 @@
 /* Print the data base of rules.  */
 
-static void                     /* Useful to call from gdb.  */
+static void                     /* Useful to call from gdb.  */
 print_rule (struct rule *r)
 {
@@ -524 +522 @@
 
       if (r->terminal)
-        ++terminal;
+        ++terminal;
     }
 
@@ -532 +530 @@
     {
       printf (_("\n# %u implicit rules, %u"), rules, terminal);
-#ifndef NO_FLOAT
+#ifndef NO_FLOAT
       printf (" (%.1f%%)", (double) terminal / (double) rules * 100.0);
 #else
       {
-        int f = (terminal * 1000 + 5) / rules;
-        printf (" (%d.%d%%)", f/10, f%10);
+        int f = (terminal * 1000 + 5) / rules;
+        printf (" (%d.%d%%)", f/10, f%10);
       }
 #endif
@@ -548 +546 @@
          makefiles and thus count_implicit_rule_limits wasn't called yet.  */
       if (num_pattern_rules != 0)
-        fatal (NILF, _("BUG: num_pattern_rules is wrong!  %u != %u"),
-               num_pattern_rules, rules);
-    }
-}
+        ONN (fatal, NILF, _("BUG: num_pattern_rules is wrong!  %u != %u"),
+             num_pattern_rules, rules);
+    }
+}