From patchwork Wed Sep 5 10:34:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Peter Nilsson X-Patchwork-Id: 966304 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-485149-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axis.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="KXk9YROS"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4250TG27Hdz9s7T for ; Wed, 5 Sep 2018 20:35:12 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :message-id:from:to:subject:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=ChkKvKgYWymnGSfS 71ifOKHkqC5Vfhxbnj0DX7uW25/Q2Qusx3m3ahst/OD0cnTZusikGfMtXgdBivds VtBGT9tEHvQAICnkfChVj96hTcYuViUVrX3zws0aPUMGDVeOw31TQ4JFOVsLpG7B iqMg4Hs+ziEH/DTrhH0uJ33DmOQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :message-id:from:to:subject:mime-version:content-type :content-transfer-encoding; s=default; bh=ks/YkeU8YLNmgj1ed+wIb6 BXSqs=; b=KXk9YROSRsB86G534BNBfLJU0vVGLUpbeyHUGcwXJ5X13LNsmJReq7 7Gl1qjnw6USsV6SiWtsUQLaF8X+fWDozIGE8GkQuAkKKeIJXH3Z5GRfUgiZP/7Jo i8SrwUriQBLfPjsRxhUR+VWPZUFD7iCMVAx8evpMXc1zG+uOICpL0= Received: (qmail 85071 invoked by alias); 5 Sep 2018 10:35:05 -0000 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 Received: (qmail 85050 invoked by uid 89); 5 Sep 2018 10:35:04 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=grown X-HELO: bastet.se.axis.com Received: from bastet.se.axis.com (HELO bastet.se.axis.com) (195.60.68.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 05 Sep 2018 10:34:59 +0000 Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id 77F15183A0; Wed, 5 Sep 2018 12:34:57 +0200 (CEST) Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id LbYBAEMPFK8m; Wed, 5 Sep 2018 12:34:56 +0200 (CEST) Received: from boulder02.se.axis.com (boulder02.se.axis.com [10.0.8.16]) by bastet.se.axis.com (Postfix) with ESMTPS id D27DC1834B; Wed, 5 Sep 2018 12:34:56 +0200 (CEST) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B32F21A06F; Wed, 5 Sep 2018 12:34:56 +0200 (CEST) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A7B831A040; Wed, 5 Sep 2018 12:34:56 +0200 (CEST) Received: from seth.se.axis.com (unknown [10.0.2.172]) by boulder02.se.axis.com (Postfix) with ESMTP; Wed, 5 Sep 2018 12:34:56 +0200 (CEST) Received: from ignucius.se.axis.com (ignucius.se.axis.com [10.88.21.50]) by seth.se.axis.com (Postfix) with ESMTP id 9BC172861; Wed, 5 Sep 2018 12:34:56 +0200 (CEST) Received: from ignucius.se.axis.com (localhost [127.0.0.1]) by ignucius.se.axis.com (8.12.8p1/8.12.8/Debian-2woody1) with ESMTP id w85AYumr018663; Wed, 5 Sep 2018 12:34:56 +0200 Received: (from hp@localhost) by ignucius.se.axis.com (8.12.8p1/8.12.8/Debian-2woody1) id w85AYtjI018659; Wed, 5 Sep 2018 12:34:55 +0200 Date: Wed, 5 Sep 2018 12:34:55 +0200 Message-Id: <201809051034.w85AYtjI018659@ignucius.se.axis.com> From: Hans-Peter Nilsson To: gcc-patches@gcc.gnu.org, fortran@gcc.gnu.org Subject: Committed: io/async.h: Use __gthread_mutex_t, not pthread_mutex_t. MIME-Version: 1.0 These pthread_mutex_t were obviously meant to be __gthread_mutex_t. See other declarations. Not being that, broke cris-elf build at r264070, restored with this patch. Also regtested on native x86_64-pc-linux-gnu. I'm not sure know why no other bare-iron target saw this, but perhaps it's because my newlib is a bit dated (...looks... yes, looks like newlib has grown pthreads since then, but that doesn't excuse this flaw). Still, there may be other similar flaws behind #ifdefs, this is just a build-fixing patch. Committed as obvious. libgfortran: * io/async.h: Use __gthread_mutex_t, not pthread_mutex_t. brgds, H-P Index: libgfortran/io/async.h =================================================================== --- libgfortran/io/async.h (revision 264070) +++ libgfortran/io/async.h (working copy) @@ -337,8 +337,8 @@ struct adv_cond typedef struct async_unit { - pthread_mutex_t io_lock; /* Lock for doing actual I/O. */ - pthread_mutex_t lock; /* Lock for manipulating the queue structure. */ + __gthread_mutex_t io_lock; /* Lock for doing actual I/O. */ + __gthread_mutex_t lock; /* Lock for manipulating the queue structure. */ bool empty; struct {