From ebf294095b6d8890593cd7115967ad7785c54896 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 14 Jan 2015 22:03:05 +0000 Subject: merge from gcc --- include/ChangeLog | 10 ++++++++++ include/libiberty.h | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index cfdff4ddf..1e54161af 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,13 @@ +2015-12-14 Jan-Benedict Glaw + + * libiberty.h: Merge Copyright year update from Binutils. + +2014-12-24 Uros Bizjak + Ben Elliston + Manuel Lopez-Ibanez + + * libiberty.h (xasprintf): Declare. + 2014-12-11 Uros Bizjak Ben Elliston Manuel Lopez-Ibanez diff --git a/include/libiberty.h b/include/libiberty.h index b9694f0f0..b33dd6598 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -1,7 +1,6 @@ /* Function declarations for libiberty. - Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. Note - certain prototypes declared in this header file are for functions whoes implementation copyright does not belong to the @@ -629,6 +628,11 @@ extern int pwait (int, int *, int); extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2; #endif +/* Like asprintf but allocates memory without fail. This works like + xmalloc. */ + +extern char *xasprintf (const char *, ...) ATTRIBUTE_MALLOC ATTRIBUTE_PRINTF_1; + #if !HAVE_DECL_VASPRINTF /* Like vsprintf but provides a pointer to malloc'd storage, which must be freed by the caller. */ -- cgit v1.2.3