summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2007-09-06 17:22:39 +0000
committerDJ Delorie <dj@delorie.com>2007-09-06 17:22:39 +0000
commit8309a662d2b43bef6e58c282d731ff696946c449 (patch)
tree503c941548cdfacca05818f84bc499a7e9e32e58
parent26f95ac4031872ea95c36d874bf7584b9af99383 (diff)
downloadbinutils-redhat-8309a662d2b43bef6e58c282d731ff696946c449.tar.gz
merge from gcc
-rw-r--r--include/ChangeLog4
-rw-r--r--include/libiberty.h5
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/pexecute.txh4
4 files changed, 14 insertions, 3 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 3c6743b2ca..9dfb1b08a4 100644
--- 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 4e697343fb..6ea8761fcd 100644
--- 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 2e4339064e..781a961157 100644
--- 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 b87c0e53a6..8baf9a0d01 100644
--- 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