merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 3c6743b2caae45d1ce01c64e0bf29453573c916b..9dfb1b08a4c1777f697927722d0415518dcd2827 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-06  Tom Tromey  <tromey@redhat.com>
+
+       * libiberty.h (pex_free): Document process killing.
+
 2007-08-31  Douglas Gregor  <doug.gregor@gmail.com>
 
        * demangle.h (enum demangle_component_type): Add

diff --git a/include/libiberty.h b/include/libiberty.h
index 4e697343fb6f9095f41e9d4da1d343b4c6342c26..6ea8761fcd1a1498da7f7dd1d994b07258792855 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -1,6 +1,6 @@
 /* Function declarations for libiberty.
 
-   Copyright 2001, 2002, 2005 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
    
    Note - certain prototypes declared in this header file are for
    functions whoes implementation copyright does not belong to the
@@ -541,7 +541,8 @@ struct pex_time
 extern int pex_get_times (struct pex_obj *, int count,
                          struct pex_time *vector);
 
-/* Clean up a pex_obj.  */
+/* Clean up a pex_obj.  If you have not called pex_get_times or
+   pex_get_status, this will try to kill the subprocesses.  */
 
 extern void pex_free (struct pex_obj *);
 

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 2e4339064ec6525eb5b85137e5b9eaa56a84fb84..781a9611579e560f49fd3ac962810dea8a776da2 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-06  Tom Tromey  <tromey@redhat.com>
+
+       * pexecute.txh (pex_free): Document process killing.
+
 2007-08-31  Douglas Gregor  <doug.gregor@gmail.com>
        
        * cp-demangle.c (d_dump): Handle

diff --git a/libiberty/pexecute.txh b/libiberty/pexecute.txh
index b87c0e53a6d36f037e4034698eeb169e82913876..8baf9a0d01bcc514547c561dbd2fb920096ad376 100644 (file)
--- a/libiberty/pexecute.txh
+++ b/libiberty/pexecute.txh
@@ -265,7 +265,9 @@ process times, all the fields will be set to @code{0}.
 
 @deftypefn Extension void pex_free (struct pex_obj @var{obj})
 
-Clean up and free all data associated with @var{obj}.
+Clean up and free all data associated with @var{obj}.  If you have not
+yet called @code{pex_get_times} or @code{pex_get_status}, this will
+try to kill the subprocesses.
 
 @end deftypefn