From patchwork Fri Oct 5 07:36:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 189422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 513EB2C00FB for ; Fri, 5 Oct 2012 17:36:39 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1350027400; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:In-Reply-To:References:Date: Message-ID:Subject:From:To:Cc:Content-Type:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=F0nNAmedfaUamyBKDi5ITuydhlo=; b=jUt/41JgD6Vh8B/dZjxVhGqRWc036SbixCQQFctwP2glYzKcmCVRrad3wxTjSr sUOXkZoNExmw7ItdHgyafzaVro+a7phxuk/vuh5XaiOvMZ9r0Vnq4d0XQNIjlh05 l1DurcQxPkDgcm6689Y74Jh6cnjxqQXm85ZxwV13nM0Sw= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:In-Reply-To:References:Date:Message-ID:Subject:From:To:Cc:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=qiHU853qLbLKnELaNruugbfhlhrL0MZUPH0EK01Vvw8M7Lh5HPNvaFlcuOWqQc nQeidHVGUEu1Fszorg518z6mHlBnwceZBYG1AV4/roO4FJh3fnnu6nY5kAfuXoqb hwGTCsja62AUd7RY9arcKaN1njr5NJuIYEuj31RXB3G04=; Received: (qmail 15802 invoked by alias); 5 Oct 2012 07:36:16 -0000 Received: (qmail 15639 invoked by uid 22791); 5 Oct 2012 07:36:14 -0000 X-SWARE-Spam-Status: No, hits=-5.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-ie0-f175.google.com (HELO mail-ie0-f175.google.com) (209.85.223.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 05 Oct 2012 07:36:07 +0000 Received: by mail-ie0-f175.google.com with SMTP id c13so3482666ieb.20 for ; Fri, 05 Oct 2012 00:36:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.42.61.196 with SMTP id v4mr6483625ich.24.1349422566235; Fri, 05 Oct 2012 00:36:06 -0700 (PDT) Received: by 10.42.158.202 with HTTP; Fri, 5 Oct 2012 00:36:06 -0700 (PDT) In-Reply-To: References: Date: Fri, 5 Oct 2012 08:36:06 +0100 Message-ID: Subject: Re: r192002 breaks mingw-w64 cross compiler From: Jonathan Wakely To: Christer Solskogen Cc: gcc-help@gcc.gnu.org, gcc-patches Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org 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 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; }