[llvm-commits] [llvm-gcc-4.2] r50403 - in /llvm-gcc-4.2/trunk/gcc: config/i386/gthr-win32.c gthr-win32.h

[Anton Korobeynikov]

Author: asl
Date: Tue Apr 29 01:22:42 2008
New Revision: 50403

URL: http://llvm.org/viewvc/llvm-project?rev=50403&view=rev
Log:
Backport from mainline

Modified:
    llvm-gcc-4.2/trunk/gcc/config/i386/gthr-win32.c
    llvm-gcc-4.2/trunk/gcc/gthr-win32.h

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/gthr-win32.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/gthr-win32.c?rev=50403&r1=50402&r2=50403&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/gthr-win32.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/gthr-win32.c Tue Apr 29 01:22:42 2008
@@ -102,7 +102,10 @@
    C++ EH. Mingw uses a thread-support DLL to work-around this problem.  */
 
 int
-__gthr_win32_key_create (__gthread_key_t *key, void (*dtor) (void *))
+__gthr_win32_key_create (__gthread_key_t *key,
+/* LLVM LOCAL begin mainline */
+			 void (*dtor) (void *) __attribute__((unused)))
+/* LLVM LOCAL end mainline */
 {
   int status = 0;
   DWORD tls_index = TlsAlloc ();

Modified: llvm-gcc-4.2/trunk/gcc/gthr-win32.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/gthr-win32.h?rev=50403&r1=50402&r2=50403&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/gthr-win32.h (original)
+++ llvm-gcc-4.2/trunk/gcc/gthr-win32.h Tue Apr 29 01:22:42 2008
@@ -562,7 +562,10 @@
    leaks, especially in threaded applications making extensive use of
    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 *))
+__gthread_key_create (__gthread_key_t *key,
+/* LLVM LOCAL begin mainline */
+		      void (*dtor) (void *) __attribute__((unused)))
+/* LLVM LOCAL end mainline */
 {
   int status = 0;
   DWORD tls_index = TlsAlloc ();