Re: r192002 breaks mingw-w64 cross compiler

[Jonathan Wakely]

On 4 October 2012 11:10, Christer Solskogen wrote:
> Here's the error:
>
> /home/solskogen/obj/_build/gcc.cross.x86_64-w64-mingw32/./gcc/xgcc
> -B/home/solskogen/obj/_build/gcc.cross.x86_64-w64-mingw32/./gcc/
> -L/home/solskogen/obj/cross-mingw-w64/x86_64-w64-mingw32/lib
> -L/home/solskogen/obj/cross-mingw-w64/mingw/lib -isystem
> /home/solskogen/obj/cross-mingw-w64/x86_64-w64-mingw32/include -isystem
> /home/solskogen/obj/cross-mingw-w64/mingw/include
> -B/home/solskogen/obj/cross-mingw-w64/x86_64-w64-mingw32/bin/
> -B/home/solskogen/obj/cross-mingw-w64/x86_64-w64-mingw32/lib/ -isystem
> /home/solskogen/obj/cross-mingw-w64/x86_64-w64-mingw32/include -isystem
> /home/solskogen/obj/cross-mingw-w64/x86_64-w64-mingw32/sys-include    -g -O2
> -pipe -march=native -m32 -O2  -g -O2 -pipe -march=native -DIN_GCC
> -DCROSS_DIRECTORY_STRUCTURE  -W -Wall -Wno-narrowing -Wwrite-strings
> -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition
> -isystem ./include   -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector
> -I. -I. -I../../.././gcc -I/home/solskogen/mingw-w64-builder/bin/gcc/libgcc
> -I/home/solskogen/mingw-w64-builder/bin/gcc/libgcc/.
> -I/home/solskogen/mingw-w64-builder/bin/gcc/libgcc/../gcc
> -I/home/solskogen/mingw-w64-builder/bin/gcc/libgcc/../include
> -I/home/solskogen/mingw-w64-builder/bin/gcc/libgcc/config/libbid
> -DENABLE_DECIMAL_BID_FORMAT -DHAVE_CC_TLS -DUSE_EMUTLS -o gthr-win32.o -MT
> gthr-win32.o -MD -MP -MF gthr-win32.dep  -c
> /home/solskogen/mingw-w64-builder/bin/gcc/libgcc/config/i386/gthr-win32.c
> In file included from
> /home/solskogen/mingw-w64-builder/bin/gcc/libgcc/config/i386/gthr-win32.c:36:0:
> /home/solskogen/mingw-w64-builder/bin/gcc/libgcc/config/i386/gthr-win32.h:
> In function '__gthread_recursive_mutex_destroy':
> /home/solskogen/mingw-w64-builder/bin/gcc/libgcc/config/i386/gthr-win32.h:543:48:
> error: '__mutex' undeclared (first use in this function)
>    return __gthr_win32_recursive_mutex_destroy (__mutex);
>                                                 ^
> /home/solskogen/mingw-w64-builder/bin/gcc/libgcc/config/i386/gthr-win32.h:543:48:
> note: each undeclared identifier is reported only once for each function it
> appears in
> /home/solskogen/mingw-w64-builder/bin/gcc/libgcc/config/i386/gthr-win32.h:541:65:
> warning: unused parameter 'mutex' [-Wunused-parameter]
>  __gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *mutex)

I've committed this fix as obvious, at r192114, sorry for the breakage.

        PR other/53889
        * config/i386/gthr-win32.h (__gthread_recursive_mutex_destroy):
        Fix variable name.

commit 6bd7f9deb11c064e5c22acd8cbd0db163edd09d7
Author: Jonathan Wakely <jwakely....@gmail.com>
Date:   Fri Oct 5 08:33:24 2012 +0100

        PR other/53889
        * config/i386/gthr-win32.h (__gthread_recursive_mutex_destroy):
        Fix parameter names.

diff --git a/libgcc/config/i386/gthr-win32.h b/libgcc/config/i386/gthr-win32.h
index 9656148..ecde941 100644
--- a/libgcc/config/i386/gthr-win32.h
+++ b/libgcc/config/i386/gthr-win32.h
@@ -538,7 +538,7 @@ __gthread_recursive_mutex_unlock 
(__gthread_recursive_mutex_t *__mutex)
 }
 
 static inline int
-__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
 {
   return __gthr_win32_recursive_mutex_destroy (__mutex);
 }
@@ -769,9 +769,9 @@ __gthread_recursive_mutex_unlock 
(__gthread_recursive_mutex_t *__mutex)
 }
 
 static inline int
-__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
 {
-  CloseHandle ((HANDLE) mutex->sema);
+  CloseHandle ((HANDLE) __mutex->sema);
   return 0;
 }