Changeset 3140 for trunk/src/kmk/remake.c

Timestamp:

Mar 14, 2018, 10: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)
• remake.c (modified) (81 diffs)

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, 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 "filedef.h"
 #include "job.h"
@@ -40 +38 @@
 #endif
 
-extern int try_implicit_rule (struct file *file, unsigned int depth);
-
 
 /* The test for circular dependencies is based on the 'updating' bit in
-   `struct file'.  However, double colon targets have seperate `struct
+   'struct file'.  However, double colon targets have separate 'struct
    file's; make sure we always use the base of the double colon chain. */
 
@@ -58 +54 @@
 unsigned int commands_started = 0;
 
-/* Current value for pruning the scan of the goal chain (toggle 0/1).  */
-static unsigned int considered;
-
-static int update_file (struct file *file, unsigned int depth);
-static int update_file_1 (struct file *file, unsigned int depth);
-static int check_dep (struct file *file, unsigned int depth,
-                      FILE_TIMESTAMP this_mtime, int *must_make_ptr);
-#ifdef CONFIG_WITH_DOT_MUST_MAKE
-static int call_must_make_target_var (struct file *file, unsigned int depth);
-#endif
-#ifdef CONFIG_WITH_DOT_IS_CHANGED
-static int call_is_changed_target_var (struct file *file);
-#endif
-static int touch_file (struct file *file);
+/* Set to the goal dependency.  Mostly needed for remaking makefiles.  */
+static struct goaldep *goal_list;
+static struct dep *goal_dep;
+
+/* Current value for pruning the scan of the goal chain.
+   All files start with considered == 0.  */
+static unsigned int considered = 0;
+
+static enum update_status update_file (struct file *file, unsigned int depth);
+static enum update_status update_file_1 (struct file *file, unsigned int depth);
+static enum update_status check_dep (struct file *file, unsigned int depth,
+                                     FILE_TIMESTAMP this_mtime, int *must_make);
+static enum update_status touch_file (struct file *file);
 static void remake_file (struct file *file);
 static FILE_TIMESTAMP name_mtime (const char *name);
 static const char *library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr);
 
-
-
-/* Remake all the goals in the `struct dep' chain GOALS.  Return -1 if nothing
+#ifdef CONFIG_WITH_DOT_MUST_MAKE
+static int call_must_make_target_var (struct file *file, unsigned int depth);
+#endif
+#ifdef CONFIG_WITH_DOT_IS_CHANGED
+static int call_is_changed_target_var (struct file *file);
+#endif
+
+
+
+/* Remake all the goals in the 'struct dep' chain GOALS.  Return -1 if nothing
    was done, 0 if all goals were updated successfully, or 1 if a goal failed.
 
@@ -84 +86 @@
    and -n should be disabled for them unless they were also command-line
    targets, and we should only make one goal at a time and return as soon as
-   one goal whose `changed' member is nonzero is successfully made.  */
-
-int
-update_goal_chain (struct dep *goals)
+   one goal whose 'changed' member is nonzero is successfully made.  */
+
+enum update_status
+update_goal_chain (struct goaldep *goaldeps)
 {
   int t = touch_flag, q = question_flag, n = just_print_flag;
-  int status = -1;
-
-#define MTIME(file) (rebuilding_makefiles ? file_mtime_no_search (file) \
-                     : file_mtime (file))
+  enum update_status status = us_none;
 
   /* Duplicate the chain so we can remove things from it.  */
 
-  goals = copy_dep_chain (goals);
-
-  {
-    /* Clear the `changed' flag of each goal in the chain.
-       We will use the flag below to notice when any commands
-       have actually been run for a target.  When no commands
-       have been run, we give an "up to date" diagnostic.  */
-
-    struct dep *g;
-    for (g = goals; g != 0; g = g->next)
-      g->changed = 0;
-  }
-
-  /* All files start with the considered bit 0, so the global value is 1.  */
-  considered = 1;
+  struct dep *goals = copy_dep_chain ((struct dep *)goaldeps);
+
+  goal_list = rebuilding_makefiles ? goaldeps : NULL;
+
+#define MTIME(file) (rebuilding_makefiles ? file_mtime_no_search (file) \
+                     : file_mtime (file))
+
+  /* Start a fresh batch of consideration.  */
+  ++considered;
 
   /* Update all the goals until they are all finished.  */
@@ -130 +123 @@
       g = goals;
       while (g != 0)
-        {
-          /* Iterate over all double-colon entries for this file.  */
-          struct file *file;
-          int stop = 0, any_not_updated = 0;
-
-          for (file = g->file->double_colon ? g->file->double_colon : g->file;
-               file != NULL;
-               file = file->prev)
-            {
-              unsigned int ocommands_started;
-              int x;
-
-              file->dontcare = g->dontcare;
-
-              check_renamed (file);
-              if (rebuilding_makefiles)
-                {
-                  if (file->cmd_target)
-                    {
-                      touch_flag = t;
-                      question_flag = q;
-                      just_print_flag = n;
-                    }
-                  else
-                    touch_flag = question_flag = just_print_flag = 0;
-                }
-
-              /* Save the old value of `commands_started' so we can compare
-                 later.  It will be incremented when any commands are
-                 actually run.  */
-              ocommands_started = commands_started;
-
-              x = update_file (file, rebuilding_makefiles ? 1 : 0);
-              check_renamed (file);
-
-              /* Set the goal's `changed' flag if any commands were started
-                 by calling update_file above.  We check this flag below to
-                 decide when to give an "up to date" diagnostic.  */
+        {
+          /* Iterate over all double-colon entries for this file.  */
+          struct file *file;
+          int stop = 0, any_not_updated = 0;
+
+          goal_dep = g;
+
+          for (file = g->file->double_colon ? g->file->double_colon : g->file;
+               file != NULL;
+               file = file->prev)
+            {
+              unsigned int ocommands_started;
+              enum update_status fail;
+
+              file->dontcare = ANY_SET (g->flags, RM_DONTCARE);
+
+              check_renamed (file);
+              if (rebuilding_makefiles)
+                {
+                  if (file->cmd_target)
+                    {
+                      touch_flag = t;
+                      question_flag = q;
+                      just_print_flag = n;
+                    }
+                  else
+                    touch_flag = question_flag = just_print_flag = 0;
+                }
+
+              /* Save the old value of 'commands_started' so we can compare
+                 later.  It will be incremented when any commands are
+                 actually run.  */
+              ocommands_started = commands_started;
+
+              fail = update_file (file, rebuilding_makefiles ? 1 : 0);
+              check_renamed (file);
+
+              /* Set the goal's 'changed' flag if any commands were started
+                 by calling update_file above.  We check this flag below to
+                 decide when to give an "up to date" diagnostic.  */
               if (commands_started > ocommands_started)
                 g->changed = 1;
 
-              /* If we updated a file and STATUS was not already 1, set it to
-                 1 if updating failed, or to 0 if updating succeeded.  Leave
-                 STATUS as it is if no updating was done.  */
-
-              stop = 0;
-              if ((x != 0 || file->updated) && status < 1)
+              stop = 0;
+              if ((fail || file->updated) && status < us_question)
                 {
-                  if (file->update_status != 0)
+                  /* We updated this goal.  Update STATUS and decide whether
+                     to stop.  */
+                  if (file->update_status)
                     {
                       /* Updating failed, or -q triggered.  The STATUS value
@@ -205 +198 @@
                           if (!rebuilding_makefiles
                               || (!just_print_flag && !question_flag))
-                            status = 0;
+                            status = us_success;
                           if (rebuilding_makefiles && file->dontcare)
                             /* This is a default makefile; stop remaking.  */
@@ -213 +206 @@
                 }
 
-              /* Keep track if any double-colon entry is not finished.
+              /* Keep track if any double-colon entry is not finished.
                  When they are all finished, the goal is finished.  */
-              any_not_updated |= !file->updated;
+              any_not_updated |= !file->updated;
 
               file->dontcare = 0;
 
-              if (stop)
-                break;
-            }
-
-          /* Reset FILE since it is null at the end of the loop.  */
-          file = g->file;
-
-          if (stop || !any_not_updated)
-            {
-              /* If we have found nothing whatever to do for the goal,
-                 print a message saying nothing needs doing.  */
-
-              if (!rebuilding_makefiles
-                  /* If the update_status is zero, we updated successfully
-                     or not at all.  G->changed will have been set above if
-                     any commands were actually started for this goal.  */
-                  && file->update_status == 0 && !g->changed
-                  /* Never give a message under -s or -q.  */
-                  && !silent_flag && !question_flag)
-                message (1, ((file->phony || file->cmds == 0)
-                             ? _("Nothing to be done for `%s'.")
-                             : _("`%s' is up to date.")),
-                         file->name);
-
-              /* This goal is finished.  Remove it from the chain.  */
-              if (lastgoal == 0)
-                goals = g->next;
-              else
-                lastgoal->next = g->next;
-
-              /* Free the storage.  */
+              if (stop)
+                break;
+            }
+
+          /* Reset FILE since it is null at the end of the loop.  */
+          file = g->file;
+
+          if (stop || !any_not_updated)
+            {
+              /* If we have found nothing whatever to do for the goal,
+                 print a message saying nothing needs doing.  */
+
+              if (!rebuilding_makefiles
+                  /* If the update_status is success, we updated successfully
+                     or not at all.  G->changed will have been set above if
+                     any commands were actually started for this goal.  */
+                  && file->update_status == us_success && !g->changed
+                  /* Never give a message under -s or -q.  */
+                  && !silent_flag && !question_flag)
+                OS (message, 1, ((file->phony || file->cmds == 0)
+                                 ? _("Nothing to be done for '%s'.")
+                                 : _("'%s' is up to date.")),
+                    file->name);
+
+              /* This goal is finished.  Remove it from the chain.  */
+              if (lastgoal == 0)
+                goals = g->next;
+              else
+                lastgoal->next = g->next;
+
+              /* Free the storage.  */
 #ifndef CONFIG_WITH_ALLOC_CACHES
-              free (g);
+              free (g);
 #else
               free_dep (g);
 #endif
 
-              g = lastgoal == 0 ? goals : lastgoal->next;
-
-              if (stop)
-                break;
-            }
-          else
-            {
-              lastgoal = g;
-              g = g->next;
-            }
-        }
-
-      /* If we reached the end of the dependency graph toggle the considered
-         flag for the next pass.  */
+              g = lastgoal == 0 ? goals : lastgoal->next;
+
+              if (stop)
+                break;
+            }
+          else
+            {
+              lastgoal = g;
+              g = g->next;
+            }
+        }
+
+      /* If we reached the end of the dependency graph update CONSIDERED
+         for the next pass.  */
       if (g == 0)
-        considered = !considered;
+        ++considered;
     }
 
@@ -285 +278 @@
 
 
+/* If we're rebuilding an included makefile that failed, and we care
+   about errors, show an error message the first time.  */
+
+void
+show_goal_error (void)
+{
+  struct goaldep *goal;
+
+  if ((goal_dep->flags & (RM_INCLUDED|RM_DONTCARE)) != RM_INCLUDED)
+    return;
+
+  for (goal = goal_list; goal; goal = goal->next)
+    if (goal_dep->file == goal->file)
+      {
+        if (goal->error)
+          {
+            OSS (error, &goal->floc, "%s: %s",
+                 goal->file->name, strerror ((int)goal->error));
+            goal->error = 0;
+          }
+        return;
+      }
+}
+
+
 /* If FILE is not up to date, execute the commands for it.
-   Return 0 if successful, 1 if unsuccessful;
-   but with some flag settings, just call `exit' if unsuccessful.
+   Return 0 if successful, non-0 if unsuccessful;
+   but with some flag settings, just call 'exit' if unsuccessful.
 
    DEPTH is the depth in recursions of this function.
@@ -297 +315 @@
    each is considered in turn.  */
 
-static int
+static enum update_status
 update_file (struct file *file, unsigned int depth)
 {
-  register int status = 0;
-  register struct file *f;
+  enum update_status status = us_success;
+  struct file *f;
 
   f = file->double_colon ? file->double_colon : file;
@@ -312 +330 @@
     {
       /* Check for the case where a target has been tried and failed but
-         the diagnostics hasn't been issued. If we need the diagnostics
+         the diagnostics haven'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;
+      if (!(f->updated && f->update_status > us_none
+            && !f->dontcare && f->no_diag))
+        {
+          DBF (DB_VERBOSE, _("Pruning file '%s'.\n"));
+          return f->command_state == cs_finished ? f->update_status : us_success;
         }
     }
@@ -325 +344 @@
   for (; f != 0; f = f->prev)
     {
+      enum update_status new;
+
       f->considered = considered;
 
-      status |= update_file_1 (f, depth);
+      new = update_file_1 (f, depth);
       check_renamed (f);
 
@@ -334 +355 @@
 
       /* If we got an error, don't bother with double_colon etc.  */
-      if (status != 0 && !keep_going_flag)
-        return status;
+      if (new && !keep_going_flag)
+        return new;
 
       if (f->command_state == cs_running
           || f->command_state == cs_deps_running)
-        {
-          /* Don't run the other :: rules for this
-             file until this rule is finished.  */
-          status = 0;
-          break;
-        }
+        /* Don't run other :: rules for this target until
+           this rule is finished.  */
+        return us_success;
+
+      if (new > status)
+        status = new;
     }
 
@@ -357 +378 @@
 
         for (d = f->deps; d != 0; d = d->next)
-          status |= update_file (d->file, depth + 1);
+          {
+            enum update_status new = update_file (d->file, depth + 1);
+            if (new > status)
+              status = new;
+          }
       }
 
@@ -369 +394 @@
 complain (struct file *file)
 {
-  const char *msg_noparent
-    = _("%sNo rule to make target `%s'%s");
-  const char *msg_parent
-    = _("%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
@@ -384 +404 @@
   for (d = file->deps; d != 0; d = d->next)
     {
-      if (d->file->updated && d->file->update_status > 0 && file->no_diag)
+      if (d->file->updated && d->file->update_status > us_none && file->no_diag)
         {
           complain (d->file);
@@ -393 +413 @@
   if (d == 0)
     {
+      show_goal_error ();
+
       /* Didn't find any dependencies to complain about. */
 
@@ -435 +457 @@
 #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, ".");
+      if (file->parent)
+        {
+          size_t l = strlen (file->name) + strlen (file->parent->name) + 4;
+          const char *m = _("%sNo rule to make target '%s', needed by '%s'%s");
+
+          if (!keep_going_flag)
+            fatal (NILF, l, m, "", file->name, file->parent->name, "");
+
+          error (NILF, l, m, "*** ", file->name, file->parent->name, ".");
+        }
       else
-        error (NILF, msg_parent, "*** ", file->name, file->parent->name, ".");
+        {
+          size_t l = strlen (file->name) + 4;
+          const char *m = _("%sNo rule to make target '%s'%s");
+
+          if (!keep_going_flag)
+            fatal (NILF, l, m, "", file->name, "");
+
+          error (NILF, l, m, "*** ", file->name, ".");
+        }
 
       file->no_diag = 0;
@@ -452 +482 @@
 }
 
-/* Consider a single `struct file' and update it as appropriate.  */
-
-static int
+/* Consider a single 'struct file' and update it as appropriate.
+   Return 0 on success, or non-0 on failure.  */
+
+static enum update_status
 update_file_1 (struct file *file, unsigned int depth)
 {
+  enum update_status dep_status = us_success;
   FILE_TIMESTAMP this_mtime;
   int noexist, must_make, deps_changed;
-  int dep_status = 0;
   struct file *ofile;
   struct dep *d, *ad;
@@ -482 +513 @@
     {
       if (file->multi_head == file)
-        DBS (DB_VERBOSE, (_("Considering target file `%s'  (multi head).\n"), file->name));
+        DBS (DB_VERBOSE, (_("Considering target file '%s'  (multi head).\n"), file->name));
       else
         {
           org_file = file = file->multi_head;
-          DBS (DB_VERBOSE, (_("Considering target file `%s' -> multi head `%s'.\n"),
+          DBS (DB_VERBOSE, (_("Considering target file '%s' -> multi head '%s'.\n"),
                               req_file->name, file->name));
           assert (file->multi_head == file);
@@ -493 +524 @@
   else
 #endif /* CONFIG_WITH_EXPLICIT_MULTITARGET */
-    DBF (DB_VERBOSE, _("Considering target file `%s'.\n"));
+    DBF (DB_VERBOSE, _("Considering target file '%s'.\n"));
 
   if (file->updated)
     {
-      if (file->update_status > 0)
-        {
-          DBF (DB_VERBOSE,
-               _("Recently tried and failed to update file `%s'.\n"));
+      if (file->update_status > us_none)
+        {
+          DBF (DB_VERBOSE,
+               _("Recently tried and failed to update file '%s'.\n"));
 
           /* If the file we tried to make is marked no_diag then no message
@@ -509 +540 @@
               complain (file);
 
-          return file->update_status;
-        }
-
-      DBF (DB_VERBOSE, _("File `%s' was considered already.\n"));
+          return file->update_status;
+        }
+
+      DBF (DB_VERBOSE, _("File '%s' was considered already.\n"));
       return 0;
     }
@@ -522 +553 @@
       break;
     case cs_running:
-      DBF (DB_VERBOSE, _("Still updating file `%s'.\n"));
+      DBF (DB_VERBOSE, _("Still updating file '%s'.\n"));
       return 0;
     case cs_finished:
-      DBF (DB_VERBOSE, _("Finished updating file `%s'.\n"));
+      DBF (DB_VERBOSE, _("Finished updating file '%s'.\n"));
       return file->update_status;
     default:
@@ -582 +613 @@
   noexist = this_mtime == NONEXISTENT_MTIME;
   if (noexist)
-    DBS (DB_BASIC, (_("File `%s' does not exist.\n"), f3->name));
+    DBS (DB_BASIC, (_("File '%s' does not exist.\n"), f3->name));
 #else /* !CONFIG_WITH_EXPLICIT_MULTITARGET */
   this_mtime = file_mtime (file);
@@ -588 +619 @@
   noexist = this_mtime == NONEXISTENT_MTIME;
   if (noexist)
-    DBF (DB_BASIC, _("File `%s' does not exist.\n"));
+    DBF (DB_BASIC, _("File '%s' does not exist.\n"));
 #endif /* !CONFIG_WITH_EXPLICIT_MULTITARGET */
   else if (ORDINARY_MTIME_MIN <= this_mtime && this_mtime <= ORDINARY_MTIME_MAX
-           && file->low_resolution_time)
+           && file->low_resolution_time)
     {
       /* Avoid spurious rebuilds due to low resolution time stamps.  */
       int ns = FILE_TIMESTAMP_NS (this_mtime);
       if (ns != 0)
-        error (NILF, _("*** Warning: .LOW_RESOLUTION_TIME file `%s' has a high resolution time stamp"),
-               file->name);
+        OS (error, NILF,
+            _("*** Warning: .LOW_RESOLUTION_TIME file '%s' has a high resolution time stamp"),
+            file->name);
       this_mtime += FILE_TIMESTAMPS_PER_S - 1 - ns;
     }
@@ -609 +641 @@
     {
       if (try_implicit_rule (file, depth))
-        DBF (DB_IMPLICIT, _("Found an implicit rule for `%s'.\n"));
+        DBF (DB_IMPLICIT, _("Found an implicit rule for '%s'.\n"));
       else
-        DBF (DB_IMPLICIT, _("No implicit rule found for `%s'.\n"));
+        DBF (DB_IMPLICIT, _("No implicit rule found for '%s'.\n"));
       file->tried_implicit = 1;
     }
@@ -617 +649 @@
       && default_file != 0 && default_file->cmds != 0)
     {
-      DBF (DB_IMPLICIT, _("Using default recipe for `%s'.\n"));
+      DBF (DB_IMPLICIT, _("Using default recipe for '%s'.\n"));
       file->cmds = default_file->cmds;
     }
@@ -648 +680 @@
       while (d)
         {
+          enum update_status new;
           FILE_TIMESTAMP mtime;
           int maybe_make;
@@ -669 +702 @@
 #endif
 
-              error (NILF, _("Circular %s <- %s dependency dropped."),
-                     file->name, d->file->name);
+              OSS (error, NILF, _("Circular %s <- %s dependency dropped."),
+                   file->name, d->file->name);
               /* We cannot free D here because our the caller will still have
                  a reference to it when we were called recursively via
@@ -692 +725 @@
             }
 
-          dep_status |= check_dep (d->file, depth, this_mtime, &maybe_make);
+          new = check_dep (d->file, depth, this_mtime, &maybe_make);
+          if (new > dep_status)
+            dep_status = new;
 
           /* Restore original dontcare flag. */
@@ -716 +751 @@
           }
 
-          if (dep_status != 0 && !keep_going_flag)
+          if (dep_status && !keep_going_flag)
             break;
 
           if (!running)
-            /* The prereq is considered changed if the timestamp has changed while
-               it was built, OR it doesn't exist.  */
+            /* The prereq is considered changed if the timestamp has changed
+               while it was built, OR it doesn't exist.  */
             d->changed = ((file_mtime (d->file) != mtime)
                           || (mtime == NONEXISTENT_MTIME));
@@ -757 +792 @@
     {
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-      for (file = f2 = org_file; f2; file = f2 = f2->multi_next)
-#endif
-        for (d = file->deps; d != 0; d = d->next)
-          if (d->file->intermediate)
+     for (file = f2 = org_file; f2; file = f2 = f2->multi_next)
+#endif
+      for (d = file->deps; d != 0; d = d->next)
+        if (d->file->intermediate)
+          {
+            enum update_status new;
+            int dontcare = 0;
+
+            FILE_TIMESTAMP mtime = file_mtime (d->file);
+            check_renamed (d->file);
+            d->file->parent = file;
+
+            /* Inherit dontcare flag from our parent. */
+            if (rebuilding_makefiles)
+              {
+                dontcare = d->file->dontcare;
+                d->file->dontcare = file->dontcare;
+              }
+
+            /* We may have already considered this file, when we didn't know
+               we'd need to update it.  Force update_file() to consider it and
+               not prune it.  */
+            d->file->considered = 0;
+
+            new = update_file (d->file, depth);
+            if (new > dep_status)
+              dep_status = new;
+
+            /* Restore original dontcare flag. */
+            if (rebuilding_makefiles)
+              d->file->dontcare = dontcare;
+
+            check_renamed (d->file);
+
             {
-              int dontcare = 0;
-
-              FILE_TIMESTAMP mtime = file_mtime (d->file);
-              check_renamed (d->file);
-              d->file->parent = file;
-
-              /* Inherit dontcare flag from our parent. */
-              if (rebuilding_makefiles)
+              register struct file *f = d->file;
+              if (f->double_colon)
+                f = f->double_colon;
+              do
                 {
-                  dontcare = d->file->dontcare;
-                  d->file->dontcare = file->dontcare;
+                  running |= (f->command_state == cs_running
+                              || f->command_state == cs_deps_running);
+                  f = f->prev;
                 }
-
-
-              dep_status |= update_file (d->file, depth);
-
-              /* Restore original dontcare flag. */
-              if (rebuilding_makefiles)
-                d->file->dontcare = dontcare;
-
-              check_renamed (d->file);
-
-              {
-                register struct file *f = d->file;
-                if (f->double_colon)
-                f = f->double_colon;
-                do
-                {
-                  running |= (f->command_state == cs_running
-                              || f->command_state == cs_deps_running);
-                  f = f->prev;
-                }
-                while (f != 0);
-              }
-
-              if (dep_status != 0 && !keep_going_flag)
-                break;
-
-              if (!running)
-                d->changed = ((file->phony && file->cmds != 0)
-                            || file_mtime (d->file) != mtime);
+              while (f != 0);
             }
+
+            if (dep_status && !keep_going_flag)
+              break;
+
+            if (!running)
+              d->changed = ((file->phony && file->cmds != 0)
+                            || file_mtime (d->file) != mtime);
+          }
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
       file = org_file;
@@ -812 +854 @@
   finish_updating (ofile);
 
-  DBF (DB_VERBOSE, _("Finished prerequisites of target file `%s'.\n"));
+  DBF (DB_VERBOSE, _("Finished prerequisites of target file '%s'.\n"));
 
   if (running)
@@ -818 +860 @@
       set_command_state (file, cs_deps_running);
       --depth;
-      DBF (DB_VERBOSE, _("The prerequisites of `%s' are being made.\n"));
+      DBF (DB_VERBOSE, _("The prerequisites of '%s' are being made.\n"));
       return 0;
     }
@@ -824 +866 @@
   /* If any dependency failed, give up now.  */
 
-  if (dep_status != 0)
-    {
-      file->update_status = dep_status;
+  if (dep_status)
+    {
+      /* I'm not sure if we can't just assign dep_status...  */
+      file->update_status = dep_status == us_none ? us_failed : dep_status;
       notice_finished_file (file);
 
       --depth;
 
-      DBF (DB_VERBOSE, _("Giving up on target file `%s'.\n"));
+      DBF (DB_VERBOSE, _("Giving up on target file '%s'.\n"));
 
       if (depth == 0 && keep_going_flag
-          && !just_print_flag && !question_flag)
-        error (NILF,
-               _("Target `%s' not remade because of errors."), file->name);
+          && !just_print_flag && !question_flag)
+        OS (error, NILF,
+            _("Target '%s' not remade because of errors."), file->name);
 
       return dep_status;
@@ -857 +900 @@
   deps_changed = 0;
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-  for (file = f2 = org_file; f2; file = f2 = f2->multi_next)
-#endif
-    for (d = file->deps; d != 0; d = d->next)
-      {
-        FILE_TIMESTAMP d_mtime = file_mtime (d->file);
+ for (file = f2 = org_file; f2; file = f2 = f2->multi_next)
+#endif
+  for (d = file->deps; d != 0; d = d->next)
+    {
+      FILE_TIMESTAMP d_mtime = file_mtime (d->file);
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
         if (d->file == file && file->multi_maybe)
           continue;
 #endif
-        check_renamed (d->file);
-
-        if (! d->ignore_mtime)
-          {
+      check_renamed (d->file);
+
+      if (! d->ignore_mtime)
+        {
 #if 1
-            /* %%% In version 4, remove this code completely to
-             implement not remaking deps if their deps are newer
-             than their parents.  */
-            if (d_mtime == NONEXISTENT_MTIME && !d->file->intermediate)
-              /* We must remake if this dep does not
-                 exist and is not intermediate.  */
-              must_make = 1;
-#endif
-
-            /* Set DEPS_CHANGED if this dep actually changed.  */
-            deps_changed |= d->changed;
-          }
-
-        /* Set D->changed if either this dep actually changed,
-           or its dependent, FILE, is older or does not exist.  */
-        d->changed |= noexist || d_mtime > this_mtime;
-
-        if (!noexist && ISDB (DB_BASIC|DB_VERBOSE))
-          {
-            const char *fmt = 0;
-
-            if (d->ignore_mtime)
-              {
-                if (ISDB (DB_VERBOSE))
-                  fmt = _("Prerequisite `%s' is order-only for target `%s'.\n");
-              }
-            else if (d_mtime == NONEXISTENT_MTIME)
-              {
-                if (ISDB (DB_BASIC))
-                  fmt = _("Prerequisite `%s' of target `%s' does not exist.\n");
-              }
-            else if (d->changed)
-              {
-                if (ISDB (DB_BASIC))
-                  fmt = _("Prerequisite `%s' is newer than target `%s'.\n");
-              }
-            else if (ISDB (DB_VERBOSE))
-              fmt = _("Prerequisite `%s' is older than target `%s'.\n");
-
-            if (fmt)
-              {
-                print_spaces (depth);
-                printf (fmt, dep_name (d), file->name);
-                fflush (stdout);
-              }
-          }
-      }
+          /* %%% In version 4, remove this code completely to
+           implement not remaking deps if their deps are newer
+           than their parents.  */
+          if (d_mtime == NONEXISTENT_MTIME && !d->file->intermediate)
+            /* We must remake if this dep does not
+               exist and is not intermediate.  */
+            must_make = 1;
+#endif
+
+          /* Set DEPS_CHANGED if this dep actually changed.  */
+          deps_changed |= d->changed;
+        }
+
+      /* Set D->changed if either this dep actually changed,
+         or its dependent, FILE, is older or does not exist.  */
+      d->changed |= noexist || d_mtime > this_mtime;
+
+      if (!noexist && ISDB (DB_BASIC|DB_VERBOSE))
+        {
+          const char *fmt = 0;
+
+          if (d->ignore_mtime)
+            {
+              if (ISDB (DB_VERBOSE))
+                fmt = _("Prerequisite '%s' is order-only for target '%s'.\n");
+            }
+          else if (d_mtime == NONEXISTENT_MTIME)
+            {
+              if (ISDB (DB_BASIC))
+                fmt = _("Prerequisite '%s' of target '%s' does not exist.\n");
+            }
+          else if (d->changed)
+            {
+              if (ISDB (DB_BASIC))
+                fmt = _("Prerequisite '%s' is newer than target '%s'.\n");
+            }
+          else if (ISDB (DB_VERBOSE))
+            fmt = _("Prerequisite '%s' is older than target '%s'.\n");
+
+          if (fmt)
+            {
+              print_spaces (depth);
+              printf (fmt, dep_name (d), file->name);
+              fflush (stdout);
+            }
+        }
+    }
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
   file = org_file;
@@ -929 +972 @@
       must_make = 1;
       DBF (DB_BASIC,
-           _("Target `%s' is double-colon and has no prerequisites.\n"));
+           _("Target '%s' is double-colon and has no prerequisites.\n"));
     }
   else if (!noexist && file->is_target && !deps_changed && file->cmds == 0
@@ -936 +979 @@
       must_make = 0;
       DBF (DB_VERBOSE,
-           _("No recipe for `%s' and no prerequisites actually changed.\n"));
+           _("No recipe for '%s' and no prerequisites actually changed.\n"));
     }
   else if (!must_make && file->cmds != 0 && always_make_flag)
     {
       must_make = 1;
-      DBF (DB_VERBOSE, _("Making `%s' due to always-make flag.\n"));
+      DBF (DB_VERBOSE, _("Making '%s' due to always-make flag.\n"));
     }
 
@@ -949 +992 @@
         {
           print_spaces (depth);
-          printf (_("No need to remake target `%s'"), file->name);
+          printf (_("No need to remake target '%s'"), file->name);
           if (!streq (file->name, file->hname))
-              printf (_("; using VPATH name `%s'"), file->hname);
+              printf (_("; using VPATH name '%s'"), file->hname);
           puts (".");
           fflush (stdout);
@@ -971 +1014 @@
     }
 
-  DBF (DB_BASIC, _("Must remake target `%s'.\n"));
+  DBF (DB_BASIC, _("Must remake target '%s'.\n"));
 
   /* It needs to be remade.  If it's VPATH and not reset via GPATH, toss the
      VPATH.  */
-  if (!streq(file->name, file->hname))
-    {
-      DB (DB_BASIC, (_("  Ignoring VPATH name `%s'.\n"), file->hname));
+  if (!streq (file->name, file->hname))
+    {
+      DB (DB_BASIC, (_("  Ignoring VPATH name '%s'.\n"), file->hname));
       file->ignore_vpath = 1;
     }
@@ -986 +1029 @@
   if (file->command_state != cs_finished)
     {
-      DBF (DB_VERBOSE, _("Recipe of `%s' is being run.\n"));
+      DBF (DB_VERBOSE, _("Recipe of '%s' is being run.\n"));
       return 0;
     }
@@ -992 +1035 @@
   switch (file->update_status)
     {
-    case 2:
-      DBF (DB_BASIC, _("Failed to remake target file `%s'.\n"));
+    case us_failed:
+      DBF (DB_BASIC, _("Failed to remake target file '%s'.\n"));
       break;
-    case 0:
-      DBF (DB_BASIC, _("Successfully remade target file `%s'.\n"));
+    case us_success:
+      DBF (DB_BASIC, _("Successfully remade target file '%s'.\n"));
       break;
-    case 1:
-      DBF (DB_BASIC, _("Target file `%s' needs remade under -q.\n"));
+    case us_question:
+      DBF (DB_BASIC, _("Target file '%s' needs to be remade under -q.\n"));
       break;
-    default:
-      assert (file->update_status >= 0 && file->update_status <= 2);
+    case us_none:
       break;
     }
@@ -1009 +1051 @@
   return file->update_status;
 }
+
+
 #ifdef CONFIG_WITH_DOT_MUST_MAKE
-
-
 /* Consider the .MUST_MAKE target variable if present.
 
@@ -1048 +1090 @@
 
           ch = *str;
-          while (isspace (ch))
+          while (ISSPACE (ch))
             ch = *++str;
 
@@ -1066 +1108 @@
 }
 #endif /* CONFIG_WITH_DOT_MUST_MAKE */
+
+
 #ifdef CONFIG_WITH_DOT_IS_CHANGED
-
-
 /* Consider the .IS_CHANGED target variable if present.
 
@@ -1104 +1146 @@
           do
             ch = *str++;
-          while (isspace (ch));
+          while (ISSPACE (ch));
 
           return (ch != '\0');
@@ -1114 +1156 @@
 
 
-/* Set FILE's `updated' flag and re-check its mtime and the mtime's of all
-   files listed in its `also_make' member.  Under -t, this function also
+/* Set FILE's 'updated' flag and re-check its mtime and the mtime's of all
+   files listed in its 'also_make' member.  Under -t, this function also
    touches FILE.
 
-   On return, FILE->update_status will no longer be -1 if it was.  */
+   On return, FILE->update_status will no longer be us_none if it was.  */
 
 void
@@ -1161 +1203 @@
   if (touch_flag
       /* The update status will be:
-                -1      if this target was not remade;
-                0       if 0 or more commands (+ or ${MAKE}) were run and won;
-                1       if some commands were run and lost.
-         We touch the target if it has commands which either were not run
-         or won when they ran (i.e. status is 0).  */
-      && file->update_status == 0)
+           us_success   if 0 or more commands (+ or ${MAKE}) were run and won;
+           us_none      if this target was not remade;
+           >us_none     if some commands were run and lost.
+         We touch the target if it has commands which either were not run
+         or won when they ran (i.e. status is 0).  */
+      && file->update_status == us_success)
     {
       if (file->cmds != 0 && file->cmds->any_recurse)
-        {
-          /* If all the command lines were recursive,
-             we don't want to do the touching.  */
-          unsigned int i;
-          for (i = 0; i < file->cmds->ncommand_lines; ++i)
-            if (!(file->cmds->lines_flags[i] & COMMANDS_RECURSE))
-              goto have_nonrecursing;
-        }
+        {
+          /* If all the command lines were recursive,
+             we don't want to do the touching.  */
+          unsigned int i;
+          for (i = 0; i < file->cmds->ncommand_lines; ++i)
+            if (!(file->cmds->lines_flags[i] & COMMANDS_RECURSE))
+              goto have_nonrecursing;
+        }
       else
-        {
-        have_nonrecursing:
-          if (file->phony)
+        {
+        have_nonrecursing:
+          if (file->phony)
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
             {
-              file->update_status = 0;
+              file->update_status = us_success;
               if (file->multi_head)
                 for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
-                  f2->update_status = 0;
+                  f2->update_status = us_success;
             }
 #else
-            file->update_status = 0;
+            file->update_status = us_success;
 #endif
           /* According to POSIX, -t doesn't affect targets with no cmds.  */
-          else if (file->cmds != 0)
+          else if (file->cmds != 0)
             {
               /* Should set file's modification date and do nothing else.  */
@@ -1205 +1247 @@
 
               /* Pretend we ran a real touch command, to suppress the
-                 "`foo' is up to date" message.  */
+                 "'foo' is up to date" message.  */
               commands_started++;
 
@@ -1214 +1256 @@
               touched = 1;
             }
-        }
+        }
     }
 
@@ -1244 +1286 @@
 
       else if (file->is_target && file->cmds == 0)
-        i = 1;
+        i = 1;
 
       file->last_mtime = i == 0 ? UNKNOWN_MTIME : NEW_MTIME;
@@ -1282 +1324 @@
     }
 
-  if (ran && file->update_status != -1)
+  if (ran && file->update_status != us_none)
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-    {
-#endif
-      /* We actually tried to update FILE, which has
-         updated its also_make's as well (if it worked).
-         If it didn't work, it wouldn't work again for them.
-         So mark them as updated with the same status.  */
-      for (d = file->also_make; d != 0; d = d->next)
-        {
-          d->file->command_state = cs_finished;
-          d->file->updated = 1;
-          d->file->update_status = file->update_status;
-
-          if (ran && !d->file->phony)
-            /* Fetch the new modification time.
-               We do this instead of just invalidating the cached time
-               so that a vpath_search can happen.  Otherwise, it would
-               never be done because the target is already updated.  */
-            f_mtime (d->file, 0);
-        }
+   {
+#endif
+    /* We actually tried to update FILE, which has
+       updated its also_make's as well (if it worked).
+       If it didn't work, it wouldn't work again for them.
+       So mark them as updated with the same status.  */
+    for (d = file->also_make; d != 0; d = d->next)
+      {
+        d->file->command_state = cs_finished;
+        d->file->updated = 1;
+        d->file->update_status = file->update_status;
+
+        if (ran && !d->file->phony)
+          /* Fetch the new modification time.
+             We do this instead of just invalidating the cached time
+             so that a vpath_search can happen.  Otherwise, it would
+             never be done because the target is already updated.  */
+          f_mtime (d->file, 0);
+      }
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-      /* Same as above but for explicit multi target rules. */
-      if (file->multi_head)
-        for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
-          {
-            f2->update_status = file->update_status;
-            if (!f2->phony)
-              f_mtime (f2, 0);
-          }
-    }
-#endif
-  else if (file->update_status == -1)
+    /* Same as above but for explicit multi target rules. */
+    if (file->multi_head)
+      for (f2 = file->multi_next; f2 != 0; f2 = f2->multi_next)
+        {
+          f2->update_status = file->update_status;
+          if (!f2->phony)
+            f_mtime (f2, 0);
+        }
+   }
+#endif
+  else if (file->update_status == us_none)
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
     {
@@ -1327 +1369 @@
     /* Nothing was done for FILE, but it needed nothing done.
        So mark it now as "succeeded".  */
-    file->update_status = 0;
+    file->update_status = us_success;
 #endif
 
@@ -1345 +1387 @@
    failed.  */
 
-static int
+static enum update_status
 check_dep (struct file *file, unsigned int depth,
            FILE_TIMESTAMP this_mtime, int *must_make_ptr)
@@ -1351 +1393 @@
   struct file *ofile;
   struct dep *d;
-  int dep_status = 0;
+  enum update_status dep_status = us_success;
 
   ++depth;
@@ -1370 +1412 @@
       check_renamed (file);
       if (mtime == NONEXISTENT_MTIME || mtime > this_mtime)
-        *must_make_ptr = 1;
+        *must_make_ptr = 1;
 #ifdef CONFIG_WITH_DOT_IS_CHANGED
       else if (   *must_make_ptr == 0
@@ -1383 +1425 @@
 
       if (!file->phony && file->cmds == 0 && !file->tried_implicit)
-        {
-          if (try_implicit_rule (file, depth))
-            DBF (DB_IMPLICIT, _("Found an implicit rule for `%s'.\n"));
-          else
-            DBF (DB_IMPLICIT, _("No implicit rule found for `%s'.\n"));
-          file->tried_implicit = 1;
-        }
+        {
+          if (try_implicit_rule (file, depth))
+            DBF (DB_IMPLICIT, _("Found an implicit rule for '%s'.\n"));
+          else
+            DBF (DB_IMPLICIT, _("No implicit rule found for '%s'.\n"));
+          file->tried_implicit = 1;
+        }
       if (file->cmds == 0 && !file->is_target
-          && default_file != 0 && default_file->cmds != 0)
-        {
-          DBF (DB_IMPLICIT, _("Using default commands for `%s'.\n"));
-          file->cmds = default_file->cmds;
-        }
+          && default_file != 0 && default_file->cmds != 0)
+        {
+          DBF (DB_IMPLICIT, _("Using default commands for '%s'.\n"));
+          file->cmds = default_file->cmds;
+        }
 
       check_renamed (file);
@@ -1403 +1445 @@
         /* If the intermediate file actually exists and is newer, then we
            should remake from it.  */
-        *must_make_ptr = 1;
+        *must_make_ptr = 1;
       else
-        {
+        {
           /* Otherwise, update all non-intermediate files we depend on, if
              necessary, and see whether any of them is more recent than the
              file on whose behalf we are checking.  */
-          struct dep *ld;
+          struct dep *ld;
           int deps_running = 0;
 
@@ -1416 +1458 @@
              prerequisite and so wasn't rebuilt then, but should be now.  */
           if (file->command_state != cs_running)
-            set_command_state (file, cs_not_started);
-
-          ld = 0;
-          d = file->deps;
-          while (d != 0)
-            {
+            {
+              /* If the target was waiting for a dependency it has to be
+                 reconsidered, as that dependency might have finished.  */
+              if (file->command_state == cs_deps_running)
+                file->considered = 0;
+
+              set_command_state (file, cs_not_started);
+            }
+
+          ld = 0;
+          d = file->deps;
+          while (d != 0)
+            {
+              enum update_status new;
               int maybe_make;
 
-              if (is_updating (d->file))
-                {
-                  error (NILF, _("Circular %s <- %s dependency dropped."),
-                         file->name, d->file->name);
-                  if (ld == 0)
-                    {
-                      file->deps = d->next;
+              if (is_updating (d->file))
+                {
+                  OSS (error, NILF, _("Circular %s <- %s dependency dropped."),
+                       file->name, d->file->name);
+                  if (ld == 0)
+                    {
+                      file->deps = d->next;
                       free_dep (d);
-                      d = file->deps;
-                    }
-                  else
-                    {
-                      ld->next = d->next;
+                      d = file->deps;
+                    }
+                  else
+                    {
+                      ld->next = d->next;
                       free_dep (d);
-                      d = ld->next;
-                    }
-                  continue;
-                }
-
-              d->file->parent = file;
+                      d = ld->next;
+                    }
+                  continue;
+                }
+
+              d->file->parent = file;
               maybe_make = *must_make_ptr;
-              dep_status |= check_dep (d->file, depth, this_mtime,
-                                       &maybe_make);
+              new = check_dep (d->file, depth, this_mtime, &maybe_make);
+              if (new > dep_status)
+                dep_status = new;
+
               if (! d->ignore_mtime)
                 *must_make_ptr = maybe_make;
-              check_renamed (d->file);
-              if (dep_status != 0 && !keep_going_flag)
-                break;
-
-              if (d->file->command_state == cs_running
-                  || d->file->command_state == cs_deps_running)
-                deps_running = 1;
-
-              ld = d;
-              d = d->next;
-            }
+              check_renamed (d->file);
+              if (dep_status && !keep_going_flag)
+                break;
+
+              if (d->file->command_state == cs_running
+                  || d->file->command_state == cs_deps_running)
+                deps_running = 1;
+
+              ld = d;
+              d = d->next;
+            }
 
           if (deps_running)
@@ -1466 +1518 @@
                commands are finished.  */
             set_command_state (file, cs_deps_running);
-        }
+        }
     }
 
@@ -1476 +1528 @@
 
 
-/* Touch FILE.  Return zero if successful, one if not.  */
-
-#define TOUCH_ERROR(call) return (perror_with_name (call, file->name), 1)
-
-static int
+/* Touch FILE.  Return us_success if successful, us_failed if not.  */
+
+#define TOUCH_ERROR(call) do{ perror_with_name ((call), file->name);    \
+                              return us_failed; }while(0)
+
+static enum update_status
 touch_file (struct file *file)
 {
   if (!silent_flag)
-    message (0, "touch %s", file->name);
-
-#ifndef NO_ARCHIVES
+    OS (message, 0, "touch %s", file->name);
+
+  /* Print-only (-n) takes precedence over touch (-t).  */
+  if (just_print_flag)
+    return us_success;
+
+#ifndef NO_ARCHIVES
   if (ar_name (file->name))
-    return ar_touch (file->name);
+    return ar_touch (file->name) ? us_failed : us_success;
   else
 #endif
     {
-      int fd = open (file->name, O_RDWR | O_CREAT, 0666);
-
+      int fd;
+
+      EINTRLOOP (fd, open (file->name, O_RDWR | O_CREAT, 0666));
       if (fd < 0)
-        TOUCH_ERROR ("touch: open: ");
+        TOUCH_ERROR ("touch: open: ");
       else
-        {
-          struct stat statbuf;
-          char buf = 'x';
+        {
+          struct stat statbuf;
+          char buf = 'x';
           int e;
 
           EINTRLOOP (e, fstat (fd, &statbuf));
-          if (e < 0)
-            TOUCH_ERROR ("touch: fstat: ");
-          /* Rewrite character 0 same as it already is.  */
-          if (read (fd, &buf, 1) < 0)
-            TOUCH_ERROR ("touch: read: ");
-          if (lseek (fd, 0L, 0) < 0L)
-            TOUCH_ERROR ("touch: lseek: ");
-          if (write (fd, &buf, 1) < 0)
-            TOUCH_ERROR ("touch: write: ");
-          /* If file length was 0, we just
-             changed it, so change it back.  */
-          if (statbuf.st_size == 0)
-            {
-              (void) close (fd);
-              fd = open (file->name, O_RDWR | O_TRUNC, 0666);
-              if (fd < 0)
-                TOUCH_ERROR ("touch: open: ");
-            }
-          (void) close (fd);
-        }
-    }
-
-  return 0;
+          if (e < 0)
+            TOUCH_ERROR ("touch: fstat: ");
+          /* Rewrite character 0 same as it already is.  */
+          EINTRLOOP (e, read (fd, &buf, 1));
+          if (e < 0)
+            TOUCH_ERROR ("touch: read: ");
+          {
+            off_t o;
+            EINTRLOOP (o, lseek (fd, 0L, 0));
+            if (o < 0L)
+              TOUCH_ERROR ("touch: lseek: ");
+          }
+          EINTRLOOP (e, write (fd, &buf, 1));
+          if (e < 0)
+            TOUCH_ERROR ("touch: write: ");
+
+          /* If file length was 0, we just changed it, so change it back.  */
+          if (statbuf.st_size == 0)
+            {
+              (void) close (fd);
+              EINTRLOOP (fd, open (file->name, O_RDWR | O_TRUNC, 0666));
+              if (fd < 0)
+                TOUCH_ERROR ("touch: open: ");
+            }
+          (void) close (fd);
+        }
+    }
+
+  return us_success;
 }
 
@@ -1543 +1607 @@
     {
       if (file->phony)
-        /* Phony target.  Pretend it succeeded.  */
-        file->update_status = 0;
+        /* Phony target.  Pretend it succeeded.  */
+        file->update_status = us_success;
       else if (file->is_target)
-        /* This is a nonexistent target file we cannot make.
-           Pretend it was successfully remade.  */
-        file->update_status = 0;
+        /* This is a nonexistent target file we cannot make.
+           Pretend it was successfully remade.  */
+        file->update_status = us_success;
       else
         {
@@ -1554 +1618 @@
           if (!rebuilding_makefiles || !file->dontcare)
             complain (file);
-          file->update_status = 2;
+          file->update_status = us_failed;
         }
     }
@@ -1563 +1627 @@
       /* The normal case: start some commands.  */
       if (!touch_flag || file->cmds->any_recurse)
-        {
-          execute_file_commands (file);
-          return;
-        }
+        {
+          execute_file_commands (file);
+          return;
+        }
 
       /* This tells notice_finished_file it is ok to touch the file.  */
-      file->update_status = 0;
+      file->update_status = us_success;
     }
 
@@ -1577 +1641 @@
 
 
-/* Return the mtime of a file, given a `struct file'.
+/* Return the mtime of a file, given a 'struct file'.
    Caches the time in the struct file to avoid excess stat calls.
 
@@ -1589 +1653 @@
 {
   FILE_TIMESTAMP mtime;
+  int propagate_timestamp;
 
   /* File's mtime is not known; must get it from the system.  */
 
-#ifndef NO_ARCHIVES
+#ifndef NO_ARCHIVES
   if (ar_name (file->name))
     {
@@ -1605 +1670 @@
 
       /* Find the modification time of the archive itself.
-         Also allow for its name to be changed via VPATH search.  */
+         Also allow for its name to be changed via VPATH search.  */
       arfile = lookup_file (arname);
       if (arfile == 0)
@@ -1612 +1677 @@
       check_renamed (arfile);
       if (search && strcmp (arfile->hname, arname))
-        {
-          /* The archive's name has changed.
-             Change the archive-member reference accordingly.  */
+        {
+          /* The archive's name has changed.
+             Change the archive-member reference accordingly.  */
 
           char *name;
-          unsigned int arlen, memlen;
-
-          arlen = strlen (arfile->hname);
-          memlen = strlen (memname);
-
-          name = xmalloc (arlen + 1 + memlen + 2);
-          memcpy (name, arfile->hname, arlen);
-          name[arlen] = '(';
-          memcpy (name + arlen + 1, memname, memlen);
-          name[arlen + 1 + memlen] = ')';
-          name[arlen + 1 + memlen + 1] = '\0';
+          unsigned int arlen, memlen;
+
+          arlen = strlen (arfile->hname);
+          memlen = strlen (memname);
+
+          name = alloca (arlen + 1 + memlen + 2);
+          memcpy (name, arfile->hname, arlen);
+          name[arlen] = '(';
+          memcpy (name + arlen + 1, memname, memlen);
+          name[arlen + 1 + memlen] = ')';
+          name[arlen + 1 + memlen + 1] = '\0';
 
           /* If the archive was found with GPATH, make the change permanent;
              otherwise defer it until later.  */
           if (arfile->name == arfile->hname)
-            rename_file (file, name);
+            rename_file (file, strcache_add (name));
           else
-            rehash_file (file, name);
+            rehash_file (file, strcache_add (name));
           check_renamed (file);
-        }
+        }
 
       free (arname);
@@ -1643 +1708 @@
 
       if (mtime == NONEXISTENT_MTIME)
-        /* The archive doesn't exist, so its members don't exist either.  */
-        return NONEXISTENT_MTIME;
+        /* The archive doesn't exist, so its members don't exist either.  */
+        return NONEXISTENT_MTIME;
 
       member_date = ar_member_date (file->hname);
@@ -1657 +1722 @@
 
       if (mtime == NONEXISTENT_MTIME && search && !file->ignore_vpath)
-        {
-          /* If name_mtime failed, search VPATH.  */
-          const char *name = vpath_search (file->name, &mtime, NULL, NULL);
-          if (name
-              /* Last resort, is it a library (-lxxx)?  */
-              || (file->name[0] == '-' && file->name[1] == 'l'
-                  && (name = library_search (file->name, &mtime)) != 0))
-            {
-              if (mtime != UNKNOWN_MTIME)
-                /* vpath_search and library_search store UNKNOWN_MTIME
-                   if they didn't need to do a stat call for their work.  */
-                file->last_mtime = mtime;
+        {
+          /* If name_mtime failed, search VPATH.  */
+          const char *name = vpath_search (file->name, &mtime, NULL, NULL);
+          if (name
+              /* Last resort, is it a library (-lxxx)?  */
+              || (file->name[0] == '-' && file->name[1] == 'l'
+                  && (name = library_search (file->name, &mtime)) != 0))
+            {
+              int name_len;
+
+              if (mtime != UNKNOWN_MTIME)
+                /* vpath_search and library_search store UNKNOWN_MTIME
+                   if they didn't need to do a stat call for their work.  */
+                file->last_mtime = mtime;
 
               /* If we found it in VPATH, see if it's in GPATH too; if so,
                  change the name right now; if not, defer until after the
                  dependencies are updated. */
-              if (gpath_search (name, strlen(name) - strlen(file->name) - 1))
+#ifndef VMS
+              name_len = strlen (name) - strlen (file->name) - 1;
+#else
+              name_len = strlen (name) - strlen (file->name);
+              if (name[name_len - 1] == '/')
+                  name_len--;
+#endif
+              if (gpath_search (name, name_len))
                 {
                   rename_file (file, name);
@@ -1680 +1754 @@
                 }
 
-              rehash_file (file, name);
-              check_renamed (file);
+              rehash_file (file, name);
+              check_renamed (file);
               /* If the result of a vpath search is -o or -W, preserve it.
                  Otherwise, find the mtime of the resulting file.  */
               if (mtime != OLD_MTIME && mtime != NEW_MTIME)
                 mtime = name_mtime (name);
-            }
-        }
+            }
+        }
     }
 
@@ -1733 +1807 @@
             {
 #ifdef NO_FLOAT
-              error (NILF, _("Warning: File `%s' has modification time in the future"),
-                     file->name);
+              OS (error, NILF,
+                  _("Warning: File '%s' has modification time in the future"),
+                  file->name);
 #else
               double from_now =
@@ -1746 +1821 @@
               else
                 sprintf (from_now_string, "%.2g", from_now);
-              error (NILF, _("Warning: File `%s' has modification time %s s in the future"),
-                     file->name, from_now_string);
+              OSS (error, NILF,
+                   _("Warning: File '%s' has modification time %s s in the future"),
+                   file->name, from_now_string);
 #endif
               clock_skew_detected = 1;
@@ -1754 +1830 @@
     }
 
-  /* Store the mtime into all the entries for this file.  */
+  /* Store the mtime into all the entries for this file for which it is safe
+     to do so: avoid propagating timestamps to double-colon rules that haven't
+     been examined so they're run or not based on the pre-update timestamp.  */
   if (file->double_colon)
     file = file->double_colon;
 
+  propagate_timestamp = file->updated;
   do
     {
       /* If this file is not implicit but it is intermediate then it was
-         made so by the .INTERMEDIATE target.  If this file has never
-         been built by us but was found now, it existed before make
-         started.  So, turn off the intermediate bit so make doesn't
-         delete it, since it didn't create it.  */
+         made so by the .INTERMEDIATE target.  If this file has never
+         been built by us but was found now, it existed before make
+         started.  So, turn off the intermediate bit so make doesn't
+         delete it, since it didn't create it.  */
       if (mtime != NONEXISTENT_MTIME && file->command_state == cs_not_started
-          && file->command_state == cs_not_started
-          && !file->tried_implicit && file->intermediate)
-        file->intermediate = 0;
-
-      file->last_mtime = mtime;
+          && !file->tried_implicit && file->intermediate)
+        file->intermediate = 0;
+
+      if (file->updated == propagate_timestamp)
+        file->last_mtime = mtime;
       file = file->prev;
     }
@@ -1890 +1969 @@
 library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr)
 {
-  static char *dirs[] =
+  static const char *dirs[] =
     {
 #ifdef KMK
@@ -1907 +1986 @@
 #endif
 # ifdef LIBDIR      /* bird */
-      LIBDIR,                   /* Defined by configuration.  */
+      LIBDIR,                   /* Defined by configuration.  */
 # else              /* bird */
       ".",          /* bird */
@@ -1926 +2005 @@
 
   /* 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;
+  unsigned int best_vpath = 0, best_path = 0;
+
+  const char **dp;
 
   libpatterns = xstrdup (variable_expand ("$(.LIBPATTERNS)"));
@@ -1946 +2024 @@
       static unsigned int buflen = 0;
       static int libdir_maxlen = -1;
+      static unsigned int std_dirs = 0;
       char *libbuf = variable_expand ("");
       const size_t libbuf_offset = libbuf - variable_buffer; /* bird */
@@ -1951 +2030 @@
       /* Expand the pattern using LIB as a replacement.  */
       {
-        char c = p[len];
-        char *p3, *p4;
-
-        p[len] = '\0';
-        p3 = find_percent (p);
-        if (!p3)
-          {
-            /* Give a warning if there is no pattern.  */
-            error (NILF, _(".LIBPATTERNS element `%s' is not a pattern"), p);
+        char c = p[len];
+        char *p3, *p4;
+
+        p[len] = '\0';
+        p3 = find_percent (p);
+        if (!p3)
+          {
+            /* Give a warning if there is no pattern.  */
+            OS (error, NILF,
+                _(".LIBPATTERNS element '%s' is not a pattern"), p);
             p[len] = c;
-            continue;
-          }
-        p4 = variable_buffer_output (libbuf, p, p3-p);
-        p4 = variable_buffer_output (p4, lib, liblen);
-        p4 = variable_buffer_output (p4, p3+1, len - (p3-p));
-        p[len] = c;
-        libbuf = variable_buffer + libbuf_offset; /* bird - variable_buffer may have been reallocated. */
+            continue;
+          }
+        p4 = variable_buffer_output (libbuf, p, p3-p);
+        p4 = variable_buffer_output (p4, lib, liblen);
+        p4 = variable_buffer_output (p4, p3+1, len - (p3-p));
+        p[len] = c;
+        libbuf = variable_buffer + libbuf_offset; /* bird - variable_buffer may have been reallocated. UPSTREAM */
       }
 
-      /* Look first for `libNAME.a' in the current directory.  */
+      /* Look first for 'libNAME.a' in the current directory.  */
       mtime = name_mtime (libbuf);
       if (mtime != NONEXISTENT_MTIME)
-        {
-          if (mtime_ptr != 0)
-            *mtime_ptr = mtime;
-          file = strcache_add (libbuf);
+        {
+          if (mtime_ptr != 0)
+            *mtime_ptr = mtime;
+          file = strcache_add (libbuf);
           /* This by definition will have the best index, so stop now.  */
           break;
-        }
+        }
 
       /* Now try VPATH search on that.  */
@@ -2016 +2096 @@
             }
           buflen = strlen (libbuf);
-          buf = xmalloc(libdir_maxlen + buflen + 2);
+          buf = xmalloc (libdir_maxlen + buflen + 2);
         }
       else if (buflen < strlen (libbuf))
@@ -2030 +2110 @@
 
         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)
                   {