[patch] libgcc/64885 - libstdc++ all_attributes failure

[patch] libgcc/64885 - libstdc++ all_attributes failure

[Jonathan Wakely]

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

This changes __attribute__((unused)) to __attribute__((__unused__)) in
three gthr-*.h headers. As Jakub pointed out at
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64885#c7 there are still
lots of other problems in these headers, but they have been there for
years and can wait for stage 1. This fixes the FAIL of the new
libstdc++ test I added recently.

Tested x86_64-linux, with --enable-threads / --disable-threads.

OK for trunk?


[-- Attachment #2: patch.txt --]
[-- Type: text/x-patch, Size: 1720 bytes --]

commit 68720ddd0a1c69a86dd97681667aebd5dffe3b32
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Sat Jan 31 20:58:12 2015 +0000

    	PR libgcc/64885
    	* gthr-single.h: Use __unused__ attribute instead of unused.
    	* config/gthr-vxworks.h: Likewise.
    	* config/i386/gthr-win32.h: Likewise.

diff --git a/libgcc/config/gthr-vxworks.h b/libgcc/config/gthr-vxworks.h
index 2f64b01..c90879a 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 1c9742a..3f3e308 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 f084fe2..bddded4 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
 

Re: [patch] libgcc/64885 - libstdc++ all_attributes failure

[Jeff Law]

On 02/12/15 08:49, Jonathan Wakely wrote:
> This changes __attribute__((unused)) to __attribute__((__unused__)) in
> three gthr-*.h headers. As Jakub pointed out at
> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64885#c7 there are still
> lots of other problems in these headers, but they have been there for
> years and can wait for stage 1. This fixes the FAIL of the new
> libstdc++ test I added recently.
>
> Tested x86_64-linux, with --enable-threads / --disable-threads.
>
> OK for trunk?
>
>
> patch.txt
>
>
> commit 68720ddd0a1c69a86dd97681667aebd5dffe3b32
> Author: Jonathan Wakely<jwakely@redhat.com>
> Date:   Sat Jan 31 20:58:12 2015 +0000
>
>      	PR libgcc/64885
>      	* gthr-single.h: Use __unused__ attribute instead of unused.
>      	* config/gthr-vxworks.h: Likewise.
>      	* config/i386/gthr-win32.h: Likewise.
Sorry, with the libstdc++ in the subject line, I deleted it assuming it 
was something you'd take care of :-0

Approved.  Sorry for the delay.

jeff