merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 9a2aeda12b0e39f66cf188eae00b3366b6a886a8..b05385773667873cad9c874efe3ab24cfa3bf349 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-29  Matt Kraai  <kraai@alumni.cmu.edu>
+
+       * pex-unix.c: Fix the spelling of longjmp.
+

 2004-11-23  Ian Lance Taylor  <ian@wasabisystems.com>
 
        PR other/18623
 2004-11-23  Ian Lance Taylor  <ian@wasabisystems.com>
 
        PR other/18623

diff --git a/libiberty/pex-unix.c b/libiberty/pex-unix.c
index ddbed8f4a05cf175c4e2fbb9bf134f9a71e6cb15..55a055e4b7e80a68e9a8265c858d06e5e95eafcf 100644 (file)
--- a/libiberty/pex-unix.c
+++ b/libiberty/pex-unix.c
@@ -61,7 +61,7 @@ extern int errno;
    via other calls to this function.
 
    This version of the function uses vfork.  In general vfork is
    via other calls to this function.
 
    This version of the function uses vfork.  In general vfork is

-   similar to setjmp/longmp, in that any variable which is modified by
+   similar to setjmp/longjmp, in that any variable which is modified by

    the child process has an indeterminate value in the parent process.
    We follow a safe approach here by not modifying any variables at
    all in the child process (with the possible exception of variables
    the child process has an indeterminate value in the parent process.
    We follow a safe approach here by not modifying any variables at
    all in the child process (with the possible exception of variables