merge from gcc
This commit is contained in:
parent
ea3923078a
commit
bc95c37690
|
@ -1,3 +1,7 @@
|
||||||
|
2009-06-09 Ian Lance Taylor <ian@airs.com>
|
||||||
|
|
||||||
|
* ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Define for C++.
|
||||||
|
|
||||||
2009-06-15 Nick Clifton <nickc@redhat.com>
|
2009-06-15 Nick Clifton <nickc@redhat.com>
|
||||||
|
|
||||||
* dis-asm.h (struct disassemble_info): New value for the flags
|
* dis-asm.h (struct disassemble_info): New value for the flags
|
||||||
|
|
|
@ -261,14 +261,23 @@ So instead we use the macro below and test it against specific values. */
|
||||||
# endif /* GNUC >= 2.96 */
|
# endif /* GNUC >= 2.96 */
|
||||||
#endif /* ATTRIBUTE_MALLOC */
|
#endif /* ATTRIBUTE_MALLOC */
|
||||||
|
|
||||||
/* Attributes on labels were valid as of gcc 2.93. */
|
/* Attributes on labels were valid as of gcc 2.93 and g++ 4.5. For
|
||||||
|
g++ an attribute on a label must be followed by a semicolon. */
|
||||||
#ifndef ATTRIBUTE_UNUSED_LABEL
|
#ifndef ATTRIBUTE_UNUSED_LABEL
|
||||||
# if (!defined (__cplusplus) && GCC_VERSION >= 2093)
|
# ifndef __cplusplus
|
||||||
# define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
|
# if GCC_VERSION >= 2093
|
||||||
|
# define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
|
||||||
|
# else
|
||||||
|
# define ATTRIBUTE_UNUSED_LABEL
|
||||||
|
# endif
|
||||||
# else
|
# else
|
||||||
# define ATTRIBUTE_UNUSED_LABEL
|
# if GCC_VERSION >= 4005
|
||||||
# endif /* !__cplusplus && GNUC >= 2.93 */
|
# define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED ;
|
||||||
#endif /* ATTRIBUTE_UNUSED_LABEL */
|
# else
|
||||||
|
# define ATTRIBUTE_UNUSED_LABEL
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef ATTRIBUTE_UNUSED
|
#ifndef ATTRIBUTE_UNUSED
|
||||||
#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
|
#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
|
||||||
|
|
Loading…
Reference in New Issue