diff options
| author | DJ Delorie <dj@delorie.com> | 2013-10-29 15:14:27 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2013-10-29 15:14:27 +0000 |
| commit | c0103114e381a575e98fa5e169474dc3da2a877c (patch) | |
| tree | 4146257f7907bc63b056c22d7398b78bb8bb3832 /libiberty | |
| parent | 34650731a33c98c22373d90ac0240565f01d7876 (diff) | |
| download | binutils-redhat-c0103114e381a575e98fa5e169474dc3da2a877c.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 9 | ||||
| -rw-r--r-- | libiberty/concat.c | 16 | ||||
| -rw-r--r-- | libiberty/testsuite/test-demangle.c | 3 |
3 files changed, 14 insertions, 14 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 19d28771d0..cda181e106 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,12 @@ +2013-10-29 Marc Glisse <marc.glisse@inria.fr> + + PR tree-optimization/58689 + * concat.c: Remove note about xmalloc. + +2013-10-27 Gerald Pfeifer <gerald@pfeifer.com> + + * testsuite/test-demangle.c: Include unistd.h. + 2013-10-25 Gary Benson <gbenson@redhat.com> * cp-demangle.c (struct d_saved_scope): New structure. diff --git a/libiberty/concat.c b/libiberty/concat.c index 9779d5663b..4144d8305c 100644 --- a/libiberty/concat.c +++ b/libiberty/concat.c @@ -25,23 +25,11 @@ Boston, MA 02110-1301, USA. */ @dots{}, @code{NULL}) Concatenate zero or more of strings and return the result in freshly -@code{xmalloc}ed memory. Returns @code{NULL} if insufficient memory is -available. The argument list is terminated by the first @code{NULL} -pointer encountered. Pointers to empty strings are ignored. +@code{xmalloc}ed memory. The argument list is terminated by the first +@code{NULL} pointer encountered. Pointers to empty strings are ignored. @end deftypefn -NOTES - - This function uses xmalloc() which is expected to be a front end - function to malloc() that deals with low memory situations. In - typical use, if malloc() returns NULL then xmalloc() diverts to an - error handler routine which never returns, and thus xmalloc will - never return a NULL pointer. If the client application wishes to - deal with low memory situations itself, it should supply an xmalloc - that just directly invokes malloc and blindly returns whatever - malloc returns. - */ diff --git a/libiberty/testsuite/test-demangle.c b/libiberty/testsuite/test-demangle.c index 11d9729999..44062478c0 100644 --- a/libiberty/testsuite/test-demangle.c +++ b/libiberty/testsuite/test-demangle.c @@ -32,6 +32,9 @@ #if HAVE_STDLIB_H # include <stdlib.h> #endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif struct line { |