From 7727f8f2c0e1a68851b646ad124d46a4dfb3be5d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 2 Mar 2015 18:02:18 +0000 Subject: [PATCH] re PR libgcc/64885 (libstdc++ all_attributes failure) PR libgcc/64885 * gthr-single.h: Use __unused__ attribute instead of unused. * config/gthr-vxworks.h: Likewise. * config/i386/gthr-win32.h: Likewise. From-SVN: r221120 --- libgcc/ChangeLog | 7 +++++++ libgcc/config/gthr-vxworks.h | 2 +- libgcc/config/i386/gthr-win32.h | 2 +- libgcc/gthr-single.h | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 603dea868e4..35e8f858f9b 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,10 @@ +2015-02-12 Jonathan Wakely + + PR libgcc/64885 + * gthr-single.h: Use __unused__ attribute instead of unused. + * config/gthr-vxworks.h: Likewise. + * config/i386/gthr-win32.h: Likewise. + 2015-02-27 Kai Tietz PR target/65038 diff --git a/libgcc/config/gthr-vxworks.h b/libgcc/config/gthr-vxworks.h index 2f64b010ed9..c90879a21b5 100644 --- a/libgcc/config/gthr-vxworks.h +++ b/libgcc/config/gthr-vxworks.h @@ -36,7 +36,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #ifdef __cplusplus #define UNUSED(x) #else -#define UNUSED(x) x __attribute__((unused)) +#define UNUSED(x) x __attribute__((__unused__)) #endif #ifdef __cplusplus diff --git a/libgcc/config/i386/gthr-win32.h b/libgcc/config/i386/gthr-win32.h index 1c9742ac073..3f3e3080275 100644 --- a/libgcc/config/i386/gthr-win32.h +++ b/libgcc/config/i386/gthr-win32.h @@ -583,7 +583,7 @@ __gthread_once (__gthread_once_t *__once, void (*__func) (void)) C++ EH. Mingw uses a thread-support DLL to work-around this problem. */ static inline int __gthread_key_create (__gthread_key_t *__key, - void (*__dtor) (void *) __attribute__((unused))) + void (*__dtor) (void *) __attribute__((__unused__))) { int __status = 0; DWORD __tls_index = TlsAlloc (); diff --git a/libgcc/gthr-single.h b/libgcc/gthr-single.h index f084fe2515f..bddded4f24e 100644 --- a/libgcc/gthr-single.h +++ b/libgcc/gthr-single.h @@ -38,7 +38,7 @@ typedef int __gthread_recursive_mutex_t; #define __GTHREAD_MUTEX_INIT_FUNCTION(mx) #define __GTHREAD_RECURSIVE_MUTEX_INIT 0 -#define UNUSED __attribute__((unused)) +#define UNUSED __attribute__((__unused__)) #ifdef _LIBOBJC -- 2.30.2