From patchwork Fri Dec 6 19:37:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1205263 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-515374-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=golang.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="QvijtvCM"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=golang-org.20150623.gappssmtp.com header.i=@golang-org.20150623.gappssmtp.com header.b="HYvjsouu"; 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 47V2ts1CJWz9sPf for ; Sat, 7 Dec 2019 06:38:11 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=Gd1I2olftMgiFt39a58hwea/vz/1K6SUeNDKUR7LFImprs YU2QjOSdWUDhekL006wptFe5iD9ExGEt2bsgC8A27VidBQ/MW4P+n2pvaK5f0/FL ji+6ecMKzmYYbhR2XO9xhiXpIcvdzMghMyZgIRhyoXFkTxVNQdu2DnS2pQH1U= 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 :mime-version:from:date:message-id:subject:to:content-type; s= default; bh=EfT9Rcc5dIrLR5cuvBDphBk/K5k=; b=QvijtvCMvP6vBWI8iCY2 gNgDa1XSV0ljxplowozT1tdeU3GFHEnycziwVItN9L14a+8xysnDJp8KEmxYIkVu Z/6oyhLrl4BiUE/93SyUE942zhGejsH+nJpQTk2pfGf8PZvUhYobC1M5YJS8NY+2 wWIv7LllZyZnR6r1bWEbCEk= Received: (qmail 87097 invoked by alias); 6 Dec 2019 19:38: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 87086 invoked by uid 89); 6 Dec 2019 19:38:05 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Received:c983, HX-HELO:sk:mail-ed, H*r:sk:mail-ed, HX-Spam-Relays-External:sk:mail-ed X-HELO: mail-ed1-f41.google.com Received: from mail-ed1-f41.google.com (HELO mail-ed1-f41.google.com) (209.85.208.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 06 Dec 2019 19:38:03 +0000 Received: by mail-ed1-f41.google.com with SMTP id l63so6924772ede.0 for ; Fri, 06 Dec 2019 11:38:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=golang-org.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=yXTrHg+Q6zqbihOsBiLkU7Pc+Yp3ir0J1P9+5KZITXg=; b=HYvjsouuMdPK/JZNY6zi+QYPeaTO4AIsuovA7qfMmSYq4qS4mhAPi6hFvafLri9G15 DzTeh+6UDSqFbzeXIx+eFBm4p76G2ev2UMTYsnzxGOC0LbgxCy5hdCzObyWYMHzw4vsv Gq+kXXJ9XXxIdP/hakjUdrFDVmUpLzFb7tVyzguoMokNaYpNYrGpbzDv55mFlOf2x+D+ JvzGq6JY1nJ0EmTXxkVvXY1KamK6WqECIfbpgyScWHN34FOA0wo/cDuwXTPvkqxL65xf bWDZsWEwSB3MS/AjuDIkPjdcvcdXxGLsXgvgMnUB8BB6NX4rJQmo++OuFhRHwKUg5o+T EYfg== MIME-Version: 1.0 From: Ian Lance Taylor Date: Fri, 6 Dec 2019 11:37:50 -0800 Message-ID: Subject: libgo patch committed: Update HURD support for embedded mOS To: gcc-patches , gofrontend-dev In the update to 1.13 the mOS field of an m was embedded rather than named. This patch updates the HURD support for that change. This should fix GCC PR 92842. I built the code on x86_64-pc-linux-gnu, but that doesn't actually test this. Committed to mainline. Ian Index: gcc/go/gofrontend/MERGE =================================================================== --- gcc/go/gofrontend/MERGE (revision 279032) +++ gcc/go/gofrontend/MERGE (working copy) @@ -1,4 +1,4 @@ -e32651d37e0c43bb7595ac94363b079610bed746 +f04751699e1a1ce98fe8bdbcce5a00f1be6a7d15 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. Index: libgo/go/runtime/os_hurd.go =================================================================== --- libgo/go/runtime/os_hurd.go (revision 278984) +++ libgo/go/runtime/os_hurd.go (working copy) @@ -39,7 +39,7 @@ func sem_timedwait(sem *_sem_t, timeout //go:nosplit func semacreate(mp *m) { - if mp.mos.waitsema != 0 { + if mp.waitsema != 0 { return } @@ -52,7 +52,7 @@ func semacreate(mp *m) { if sem_init(sem, 0, 0) != 0 { throw("sem_init") } - mp.mos.waitsema = uintptr(unsafe.Pointer(sem)) + mp.waitsema = uintptr(unsafe.Pointer(sem)) } //go:nosplit @@ -62,7 +62,7 @@ func semasleep(ns int64) int32 { var ts timespec ts.setNsec(ns) - if sem_timedwait((*_sem_t)(unsafe.Pointer(_m_.mos.waitsema)), &ts) != 0 { + if sem_timedwait((*_sem_t)(unsafe.Pointer(_m_.waitsema)), &ts) != 0 { err := errno() if err == _ETIMEDOUT || err == _EAGAIN || err == _EINTR { return -1 @@ -72,7 +72,7 @@ func semasleep(ns int64) int32 { return 0 } for { - r1 := sem_wait((*_sem_t)(unsafe.Pointer(_m_.mos.waitsema))) + r1 := sem_wait((*_sem_t)(unsafe.Pointer(_m_.waitsema))) if r1 == 0 { break } @@ -86,7 +86,7 @@ func semasleep(ns int64) int32 { //go:nosplit func semawakeup(mp *m) { - if sem_post((*_sem_t)(unsafe.Pointer(mp.mos.waitsema))) != 0 { + if sem_post((*_sem_t)(unsafe.Pointer(mp.waitsema))) != 0 { throw("sem_post") } }