merge from gcc
This commit is contained in:
parent
bffa834f8e
commit
53726a558d
|
@ -1,3 +1,10 @@
|
|||
2005-05-24 Gabriel Dos Reis <gdr@integrable-solutions.net>
|
||||
|
||||
* libiberty.h (ACONCAT): Properly cast value of alloca().
|
||||
|
||||
* ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Don't define if
|
||||
__cplusplus.
|
||||
|
||||
2005-05-12 Steve Ellcey <sje@cup.hp.com>
|
||||
|
||||
libiberty.h: Do not define empty basename prototype.
|
||||
|
|
|
@ -258,11 +258,11 @@ So instead we use the macro below and test it against specific values. */
|
|||
|
||||
/* Attributes on labels were valid as of gcc 2.93. */
|
||||
#ifndef ATTRIBUTE_UNUSED_LABEL
|
||||
# if (GCC_VERSION >= 2093)
|
||||
# if (!defined (__cplusplus) && GCC_VERSION >= 2093)
|
||||
# define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
|
||||
# else
|
||||
# define ATTRIBUTE_UNUSED_LABEL
|
||||
# endif /* GNUC >= 2.93 */
|
||||
# endif /* !__cplusplus && GNUC >= 2.93 */
|
||||
#endif /* ATTRIBUTE_UNUSED_LABEL */
|
||||
|
||||
#ifndef ATTRIBUTE_UNUSED
|
||||
|
|
|
@ -156,7 +156,7 @@ extern char *libiberty_concat_ptr;
|
|||
strings. Allocates memory using alloca. The arguments are
|
||||
evaluated twice! */
|
||||
#define ACONCAT(ACONCAT_PARAMS) \
|
||||
(libiberty_concat_ptr = alloca (concat_length ACONCAT_PARAMS + 1), \
|
||||
(libiberty_concat_ptr = (char *) alloca (concat_length ACONCAT_PARAMS + 1), \
|
||||
concat_copy2 ACONCAT_PARAMS)
|
||||
|
||||
/* Check whether two file descriptors refer to the same file. */
|
||||
|
|
Loading…
Reference in New Issue