Changeset 2591 in kBuild for trunk/src/kmk/remake.c

Timestamp:

Jun 17, 2012 8:45:31 PM (13 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• remake.c (modified) (42 diffs)

trunk/src/kmk

@@ -13 +13 @@
 stamp-*
 makebook*
+
 .*gdbinit
+.gdb_history
+
 *.dep
 *.dvi
@@ -31 +34 @@
 *.pg
 *.pgs
+
 README
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache
@@ -52 +57 @@
 config.h.W32
 config.h-vms
+
 loadavg
 loadavg.c
 make
+
 .deps
 .dep_segment
+ID
+TAGS
+
 _*
 sun4
@@ -72 +82 @@
 sol2
 i486-linux
+
 customs
+
 install-sh
 mkinstalldirs
+
+.directive.asc

@@ -13 +13 @@
 stamp-*
 makebook*
+
 .*gdbinit
+.gdb_history
+
 *.dep
 *.dvi
@@ -31 +34 @@
 *.pg
 *.pgs
+
 README
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache
@@ -52 +57 @@
 config.h.W32
 config.h-vms
+
 loadavg
 loadavg.c
 make
+
 .deps
 .dep_segment
+ID
+TAGS
+
 _*
 sun4
@@ -72 +82 @@
 sol2
 i486-linux
+
 customs
+
 install-sh
 mkinstalldirs
+
+.directive.asc

trunk/src/kmk/remake.c

@@ -1 +1 @@
 /* Basic dependency engine 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 Free Software
-Foundation, Inc.
+1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+2010 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
@@ -90 +90 @@
 {
   int t = touch_flag, q = question_flag, n = just_print_flag;
-  unsigned int j = job_slots;
   int status = -1;
 
@@ -142 +141 @@
               unsigned int ocommands_started;
               int x;
+
+              file->dontcare = g->dontcare;
+
               check_renamed (file);
               if (rebuilding_makefiles)
@@ -215 +217 @@
               any_not_updated |= !file->updated;
 
+              file->dontcare = 0;
+
               if (stop)
                 break;
@@ -275 +279 @@
       question_flag = q;
       just_print_flag = n;
-      job_slots = j;
     }
 
@@ -308 +311 @@
   if (f->considered == considered)
     {
-      DBF (DB_VERBOSE, _("Pruning file `%s'.\n"));
-      return f->command_state == cs_finished ? f->update_status : 0;
+      /* Check for the case where a target has been tried and failed but
+         the diagnostics hasn't been issued. If we need the diagnostics
+         then we will have to continue. */
+      if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag))
+        {
+          DBF (DB_VERBOSE, _("Pruning file `%s'.\n"));
+          return f->command_state == cs_finished ? f->update_status : 0;
+        }
     }
 
@@ -326 +335 @@
       /* If we got an error, don't bother with double_colon etc.  */
       if (status != 0 && !keep_going_flag)
-        return status;
+        return status;
 
       if (f->command_state == cs_running
@@ -358 +367 @@
 
 static void
-complain (const struct file *file)
+complain (struct file *file)
 {
   const char *msg_noparent
@@ -365 +374 @@
     = _("%sNo rule to make target `%s', needed by `%s'%s");
 
+  /* If this file has no_diag set then it means we tried to update it
+     before in the dontcare mode and failed. The target that actually
+     failed is not necessarily this file but could be one of its direct
+     or indirect dependencies. So traverse this file's dependencies and
+     find the one that actually caused the failure. */
+
+  struct dep *d;
+
+  for (d = file->deps; d != 0; d = d->next)
+    {
+      if (d->file->updated && d->file->update_status > 0 && file->no_diag)
+        {
+          complain (d->file);
+          break;
+        }
+    }
+
+  if (d == 0)
+    {
+      /* Didn't find any dependencies to complain about. */
+
 #ifdef KMK
-  /* jokes */
-  if (!keep_going_flag && file->parent == 0)
-    {
-      const char *msg_joke = 0;
-      extern struct dep *goals;
-
-      /* classics */
-      if (!strcmp (file->name, "fire")
-       || !strcmp (file->name, "Fire"))
-        msg_joke = "No matches.\n";
-      else if (!strcmp (file->name, "love")
-            || !strcmp (file->name, "Love")
-            || !strcmp (file->name, "peace")
-            || !strcmp (file->name, "Peace"))
-        msg_joke = "Not war.\n";
-      else if (!strcmp (file->name, "war"))
-        msg_joke = "Don't know how to make war.\n";
-
-      /* http://xkcd.com/149/ - GNU Make bug #23273. */
-      else if ((   !strcmp (file->name, "me")
-                && goals != 0
-                && !strcmp (dep_name(goals), "me")
-                && goals->next != 0
-                && !strcmp (dep_name(goals->next), "a")
-                && goals->next->next != 0)
-            || !strncmp (file->name, "me a ", 5))
-        msg_joke =
+      /* jokes */
+      if (!keep_going_flag && file->parent == 0)
+        {
+          const char *msg_joke = 0;
+          extern struct dep *goals;
+
+          /* classics */
+          if (!strcmp (file->name, "fire")
+           || !strcmp (file->name, "Fire"))
+            msg_joke = "No matches.\n";
+          else if (!strcmp (file->name, "love")
+                || !strcmp (file->name, "Love")
+                || !strcmp (file->name, "peace")
+                || !strcmp (file->name, "Peace"))
+            msg_joke = "Not war.\n";
+          else if (!strcmp (file->name, "war"))
+            msg_joke = "Don't know how to make war.\n";
+
+          /* http://xkcd.com/149/ - GNU Make bug #23273. */
+          else if ((   !strcmp (file->name, "me")
+                    && goals != 0
+                    && !strcmp (dep_name(goals), "me")
+                    && goals->next != 0
+                    && !strcmp (dep_name(goals->next), "a")
+                    && goals->next->next != 0)
+                || !strncmp (file->name, "me a ", 5))
+            msg_joke =
 # ifdef HAVE_UNISTD_H
                    getuid () == 0 ? "Okay.\n" :
 # endif
-                   "What? Make it yourself!\n";
-      if (msg_joke)
+                       "What? Make it yourself!\n";
+          if (msg_joke)
+            {
+              fputs (msg_joke, stderr);
+              die (2);
+            }
+        }
+#endif /* KMK */
+
+      if (!keep_going_flag)
         {
-          fputs (msg_joke, stderr);
-          die (2);
+          if (file->parent == 0)
+            fatal (NILF, msg_noparent, "", file->name, "");
+
+          fatal (NILF, msg_parent, "", file->name, file->parent->name, "");
         }
-    }
-#endif /* KMK */
-
-  if (!keep_going_flag)
-    {
+
       if (file->parent == 0)
-        fatal (NILF, msg_noparent, "", file->name, "");
-
-      fatal (NILF, msg_parent, "", file->name, file->parent->name, "");
-    }
-
-  if (file->parent == 0)
-    error (NILF, msg_noparent, "*** ", file->name, ".");
-  else
-    error (NILF, msg_parent, "*** ", file->name, file->parent->name, ".");
+        error (NILF, msg_noparent, "*** ", file->name, ".");
+      else
+        error (NILF, msg_parent, "*** ", file->name, file->parent->name, ".");
+
+      file->no_diag = 0;
+    }
 }
 
@@ -424 +457 @@
 update_file_1 (struct file *file, unsigned int depth)
 {
-  register FILE_TIMESTAMP this_mtime;
+  FILE_TIMESTAMP this_mtime;
   int noexist, must_make, deps_changed;
   int dep_status = 0;
-  register struct dep *d, *lastd;
+  struct file *ofile;
+  struct dep *d, *ad;
+  struct dep amake;
   int running = 0;
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  struct file *org_file = file;
   struct file *f2, *f3;
 
@@ -438 +474 @@
       DBS (DB_VERBOSE, (_("Considering target file `%s' -> multi head `%s'.\n"),
                           file->name, file->multi_head->name));
-      file = file->multi_head;
+      org_file = file = file->multi_head;
     }
   else
@@ -451 +487 @@
                _("Recently tried and failed to update file `%s'.\n"));
 
-          /* If the file we tried to make is marked dontcare then no message
+          /* If the file we tried to make is marked no_diag then no message
              was printed about it when it failed during the makefile rebuild.
              If we're trying to build it again in the normal rebuild, print a
              message now.  */
-          if (file->dontcare && !rebuilding_makefiles)
-            {
-              file->dontcare = 0;
+          if (file->no_diag && !file->dontcare)
               complain (file);
-            }
 
           return file->update_status;
@@ -483 +516 @@
     }
 
+  /* Determine whether the diagnostics will be issued should this update
+     fail. */
+  file->no_diag = file->dontcare;
+
   ++depth;
 
   /* Notice recursive update of the same file.  */
   start_updating (file);
+
+  /* We might change file if we find a different one via vpath;
+     remember this one to turn off updating.  */
+  ofile = file;
 
   /* Looking at the file's modtime beforehand allows the possibility
@@ -554 +595 @@
     }
 
-  /* Update all non-intermediate files we depend on, if necessary,
-     and see whether any of them is more recent than this file.
-     For explicit multitarget rules we must iterate all the output
+  /* Update all non-intermediate files we depend on, if necessary, and see
+     whether any of them is more recent than this file.  We need to walk our
+     deps, AND the deps of any also_make targets to ensure everything happens
+     in the correct order.
+
+     bird: For explicit multitarget rules we must iterate all the output
      files to get the correct picture.  The special .MUST_MAKE
-     target variable call is also done from this context.  */
+     target variable call is also done from this context. */
 
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-  for (f2 = file; f2; f2 = f2->multi_next)
-    {
-      lastd = 0;
-      d = f2->deps;
-#else
-      lastd = 0;
-      d = file->deps;
-#endif
-      while (d != 0)
+ assert (file == org_file);
+ for (f2 = file; f2; file = f2 = f2->multi_next)
+ {
+#endif
+  amake.file = file;
+  amake.next = file->also_make;
+  ad = &amake;
+  while (ad)
+    {
+      struct dep *lastd = 0;
+
+      /* Find the deps we're scanning */
+      d = ad->file->deps;
+      ad = ad->next;
+
+      while (d)
         {
           FILE_TIMESTAMP mtime;
@@ -584 +635 @@
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
               /* silently ignore the order-only dep hack. */
-              if (f2->multi_maybe && d->file == file)
+              if (file->multi_maybe && d->file == org_file)
                 {
                   lastd = d;
@@ -593 +644 @@
 
               error (NILF, _("Circular %s <- %s dependency dropped."),
-#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-                     f2->name, d->file->name);
-#else
                      file->name, d->file->name);
-#endif
               /* We cannot free D here because our the caller will still have
                  a reference to it when we were called recursively via
                  check_dep below.  */
               if (lastd == 0)
-#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-                f2->deps = d->next;
-#else
                 file->deps = d->next;
-#endif
               else
                 lastd->next = d->next;
@@ -613 +656 @@
             }
 
-#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-          d->file->parent = f2;
-#else
           d->file->parent = file;
-#endif
           maybe_make = must_make;
 
@@ -626 +665 @@
               d->file->dontcare = file->dontcare;
             }
-
 
           dep_status |= check_dep (d->file, depth, this_mtime, &maybe_make);
@@ -664 +702 @@
           d = d->next;
         }
+    }
 
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-      if (dep_status != 0 && !keep_going_flag)
-        break;
-    }
+    if (dep_status != 0 && !keep_going_flag)
+      break;
+  }
+  file = org_file;
 #endif
 
@@ -677 +717 @@
 # ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
   if (!must_make)
-    for (f2 = file; f2 && !must_make; f2 = f2->multi_next)
+    for (f2 = org_file; f2 && !must_make; f2 = f2->multi_next)
       must_make = call_must_make_target_var (f2, depth);
 # else
@@ -691 +731 @@
     {
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-      for (f2 = file; f2; f2 = f2->multi_next)
-        for (d = f2->deps; d != 0; d = d->next)
-#else
+      for (file = f2 = org_file; f2; file = f2 = f2->multi_next)
+#endif
         for (d = file->deps; d != 0; d = d->next)
-#endif
           if (d->file->intermediate)
             {
@@ -702 +740 @@
               FILE_TIMESTAMP mtime = file_mtime (d->file);
               check_renamed (d->file);
-#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-              d->file->parent = f2;
-#else
               d->file->parent = file;
-#endif
 
               /* Inherit dontcare flag from our parent. */
@@ -741 +775 @@
 
               if (!running)
-#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-                d->changed = ((f2->phony && f2->cmds != 0)
-#else
                 d->changed = ((file->phony && file->cmds != 0)
-#endif
                             || file_mtime (d->file) != mtime);
             }
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+      file = org_file;
+#endif
     }
 
   finish_updating (file);
+  finish_updating (ofile);
 
   DBF (DB_VERBOSE, _("Finished prerequisites of target file `%s'.\n"));
@@ -797 +831 @@
   deps_changed = 0;
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-  for (f2 = file; f2; f2 = f2->multi_next)
+  for (file = f2 = org_file; f2; file = f2 = f2->multi_next)
 #endif
     for (d = file->deps; d != 0; d = d->next)
@@ -803 +837 @@
         FILE_TIMESTAMP d_mtime = file_mtime (d->file);
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-        if (d->file == file && f2->multi_maybe)
+        if (d->file == file && file->multi_maybe)
           continue;
 #endif
@@ -858 +892 @@
           }
       }
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  file = org_file;
+#endif
 
   /* Here depth returns to the value it had when we were called.  */
@@ -1170 +1207 @@
          would have been updated. */
 
-      if (question_flag || just_print_flag || touch_flag)
+      if ((question_flag || just_print_flag || touch_flag) && file->cmds)
         {
           for (i = file->cmds->ncommand_lines; i > 0; --i)
@@ -1278 +1315 @@
            FILE_TIMESTAMP this_mtime, int *must_make_ptr)
 {
+  struct file *ofile;
   struct dep *d;
   int dep_status = 0;
@@ -1283 +1321 @@
   ++depth;
   start_updating (file);
+
+  /* We might change file if we find a different one via vpath;
+     remember this one to turn off updating.  */
+  ofile = file;
 
   if (file->phony || !file->intermediate)
@@ -1333 +1375 @@
              necessary, and see whether any of them is more recent than the
              file on whose behalf we are checking.  */
-          struct dep *lastd;
+          struct dep *ld;
           int deps_running = 0;
 
-          /* Reset this target's state so that we check it fresh.  It could be
-             that it's already been checked as part of an order-only
-             prerequisite and so wasn't rebuilt then, but should be now.
-
-             bird: What if we're already running the recipe?  We don't wish
-                   it to be started once again do we?  This happens with the
-                   SECONDARY Test #9 here now... If the idea is to re-evaluate
-                   the target regardless of whether it's running or no, then
-                   perhaps saving and restoring is a better idea?
-                   See bug #15919.  */
-          if (file->command_state != cs_running) /* bird */
+          /* If this target is not running, set it's state so that we check it
+             fresh.  It could be it was checked as part of an order-only
+             prerequisite and so wasn't rebuilt then, but should be now.  */
+          if (file->command_state != cs_running)
             set_command_state (file, cs_not_started);
 
-          lastd = 0;
+          ld = 0;
           d = file->deps;
           while (d != 0)
@@ -1359 +1394 @@
                   error (NILF, _("Circular %s <- %s dependency dropped."),
                          file->name, d->file->name);
-                  if (lastd == 0)
+                  if (ld == 0)
                     {
                       file->deps = d->next;
@@ -1367 +1402 @@
                   else
                     {
-                      lastd->next = d->next;
+                      ld->next = d->next;
                       free_dep (d);
-                      d = lastd->next;
+                      d = ld->next;
                     }
                   continue;
@@ -1388 +1423 @@
                 deps_running = 1;
 
-              lastd = d;
+              ld = d;
               d = d->next;
             }
@@ -1401 +1436 @@
 
   finish_updating (file);
+  finish_updating (ofile);
+
   return dep_status;
 }
@@ -1588 +1625 @@
         {
           /* If name_mtime failed, search VPATH.  */
-          const char *name = vpath_search (file->name, &mtime);
+          const char *name = vpath_search (file->name, &mtime, NULL, NULL);
           if (name
               /* Last resort, is it a library (-lxxx)?  */
@@ -1839 +1876 @@
     };
 
-  static char *libpatterns = NULL;
-
-  const char *libname = lib+2;  /* Name without the '-l'.  */
+  const char *file = 0;
+  char *libpatterns;
   FILE_TIMESTAMP mtime;
 
@@ -1848 +1884 @@
   const char *p2;
   unsigned int len;
+  unsigned int liblen;
+
+  /* Information about the earliest (in the vpath sequence) match.  */
+  unsigned int best_vpath = 0, best_path = 0; /* bird: gcc maybe used uninitialized (both) */
+  unsigned int std_dirs = 0;
 
   char **dp;
 
-  /* If we don't have libpatterns, get it.  */
-  if (!libpatterns)
-    {
-      int save = warn_undefined_variables_flag;
-      warn_undefined_variables_flag = 0;
-
-      libpatterns = xstrdup (variable_expand ("$(strip $(.LIBPATTERNS))"));
-
-      warn_undefined_variables_flag = save;
-    }
-
-  /* Loop through all the patterns in .LIBPATTERNS, and search on each one.  */
+  libpatterns = xstrdup (variable_expand ("$(.LIBPATTERNS)"));
+
+  /* Skip the '-l'.  */
+  lib += 2;
+  liblen = strlen (lib);
+
+  /* Loop through all the patterns in .LIBPATTERNS, and search on each one.
+     To implement the linker-compatible behavior we have to search through
+     all entries in .LIBPATTERNS and choose the "earliest" one.  */
   p2 = libpatterns;
   while ((p = find_next_token (&p2, &len)) != 0)
@@ -1872 +1910 @@
       const size_t libbuf_offset = libbuf - variable_buffer; /* bird */
 
-      /* Expand the pattern using LIBNAME as a replacement.  */
+      /* Expand the pattern using LIB as a replacement.  */
       {
         char c = p[len];
@@ -1881 +1919 @@
         if (!p3)
           {
-            /* Give a warning if there is no pattern, then remove the
-               pattern so it's ignored next time.  */
+            /* Give a warning if there is no pattern.  */
             error (NILF, _(".LIBPATTERNS element `%s' is not a pattern"), p);
-            for (; len; --len, ++p)
-              *p = ' ';
-            *p = c;
+            p[len] = c;
             continue;
           }
         p4 = variable_buffer_output (libbuf, p, p3-p);
-        p4 = variable_buffer_output (p4, libname, strlen (libname));
+        p4 = variable_buffer_output (p4, lib, liblen);
         p4 = variable_buffer_output (p4, p3+1, len - (p3-p));
         p[len] = c;
@@ -1902 +1937 @@
           if (mtime_ptr != 0)
             *mtime_ptr = mtime;
-          return strcache_add (libbuf);
+          file = strcache_add (libbuf);
+          /* This by definition will have the best index, so stop now.  */
+          break;
         }
 
@@ -1908 +1945 @@
 
       {
-        const char *file = vpath_search (libbuf, mtime_ptr);
-        if (file)
-          return file;
+        unsigned int vpath_index, path_index;
+        const char* f = vpath_search (libbuf, mtime_ptr ? &mtime : NULL,
+                                      &vpath_index, &path_index);
+        if (f)
+          {
+            /* If we have a better match, record it.  */
+            if (file == 0 ||
+                vpath_index < best_vpath ||
+                (vpath_index == best_vpath && path_index < best_path))
+              {
+                file = f;
+                best_vpath = vpath_index;
+                best_path = path_index;
+
+                if (mtime_ptr != 0)
+                  *mtime_ptr = mtime;
+              }
+          }
       }
 
@@ -1916 +1968 @@
 
       if (!buflen)
-        {
-          for (dp = dirs; *dp != 0; ++dp)
-            {
-              int l = strlen (*dp);
-              if (l > libdir_maxlen)
-                libdir_maxlen = l;
-            }
-          buflen = strlen (libbuf);
-          buf = xmalloc(libdir_maxlen + buflen + 2);
-        }
+        {
+          for (dp = dirs; *dp != 0; ++dp)
+            {
+              int l = strlen (*dp);
+              if (l > libdir_maxlen)
+                libdir_maxlen = l;
+              std_dirs++;
+            }
+          buflen = strlen (libbuf);
+          buf = xmalloc(libdir_maxlen + buflen + 2);
+        }
       else if (buflen < strlen (libbuf))
-        {
-          buflen = strlen (libbuf);
-          buf = xrealloc (buf, libdir_maxlen + buflen + 2);
-        }
-
-      for (dp = dirs; *dp != 0; ++dp)
-        {
-          sprintf (buf, "%s/%s", *dp, libbuf);
-          mtime = name_mtime (buf);
-          if (mtime != NONEXISTENT_MTIME)
-            {
-              if (mtime_ptr != 0)
-                *mtime_ptr = mtime;
-              return strcache_add (buf);
-            }
-        }
-    }
-
-  return 0;
+        {
+          buflen = strlen (libbuf);
+          buf = xrealloc (buf, libdir_maxlen + buflen + 2);
+        }
+
+      {
+        /* Use the last std_dirs index for standard directories. This
+           was it will always be greater than the VPATH index.  */
+        unsigned int vpath_index = ~((unsigned int)0) - std_dirs;
+
+        for (dp = dirs; *dp != 0; ++dp)
+          {
+            sprintf (buf, "%s/%s", *dp, libbuf);
+            mtime = name_mtime (buf);
+            if (mtime != NONEXISTENT_MTIME)
+              {
+                if (file == 0 || vpath_index < best_vpath)
+                  {
+                    file = strcache_add (buf);
+                    best_vpath = vpath_index;
+
+                    if (mtime_ptr != 0)
+                      *mtime_ptr = mtime;
+                  }
+              }
+
+            vpath_index++;
+          }
+      }
+
+    }
+
+  free (libpatterns);
+  return file;
 }

@@ -13 +13 @@
 stamp-*
 makebook*
+
 .*gdbinit
+.gdb_history
+
 *.dep
 *.dvi
@@ -31 +34 @@
 *.pg
 *.pgs
+
 README
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache
@@ -52 +57 @@
 config.h.W32
 config.h-vms
+
 loadavg
 loadavg.c
 make
+
 .deps
 .dep_segment
+ID
+TAGS
+
 _*
 sun4
@@ -72 +82 @@
 sol2
 i486-linux
+
 customs
+
 install-sh
 mkinstalldirs
+
+.directive.asc