From patchwork Tue Dec 8 01:08:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1412363 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=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=SdchtSCl; dkim-atps=neutral Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CqhsV72sKz9sSn for ; Tue, 8 Dec 2020 12:09:17 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 710AB3854832; Tue, 8 Dec 2020 01:09:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 710AB3854832 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1607389752; bh=VPsGWoIVqjRzJmnlDEDaJXH39gwMxjM6eXwEGNPRuv0=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=SdchtSClIPntWPBlpc7hBWYjX1/p9c6ElN0q5Q2pGv3gzG1gjdI5WRsvLk4BrVQDV uf/HvKCkYuGr1zDYnNy50jdn3BFZjlbHhgRvtRQsXHADQTGfIkdm78Jnb6rADqMbTw sVoALZoRCj0u4UT99gfj1tjHUdXlcT134+GWK0os= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id DD892385803E for ; Tue, 8 Dec 2020 01:09:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DD892385803E Received: by mail-ej1-x62a.google.com with SMTP id ce23so18484238ejb.8 for ; Mon, 07 Dec 2020 17:09:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=VPsGWoIVqjRzJmnlDEDaJXH39gwMxjM6eXwEGNPRuv0=; b=oy5JDpnnd8HjfOQEkReFcxgdkXr5woQz0eit3AK6moR8QecI8wSEd0hYna531vXKC5 rJoO41Ns9mRMQptdgJSse3VngtAul49c/oZ3OFuQeSDuw8EgJWj/qnnKJM3bjQYnfKdU lDfnAF4d5Bw66CvPdGQgO9StbBwpUykgmYu9cSYz9z1xZD1+7DxK+sgoT/LU+sHbtg/3 76EiRlv7pdG5/fb67ZmLmNPzhC1C4mmZpV1Tt30hq6n0Ck1acG2oPxfkAabCsDA1+5cN e7GDekEimZom5jy94Av531xsUvwbX0Zufrt2PMlOdmzIAkovRMshOL0ItRYjTGN0Mf3J eGLw== X-Gm-Message-State: AOAM5322fUGfJtJKwaLEecnV+kZNcHSgC+N/Mk9/7/yx3MSXkJj6y2BR fGAVhwFMcLWvqWueGcBA2C/nJ/VmPsfIShoq36LLK6wLOt3aag== X-Google-Smtp-Source: ABdhPJyo7k9qrj6+vlppCwevXd1oLTIT4RZ8V4j7tsT208e52HaNzW+SZnTzF0pFOhwD8hjTu1atg8AjW1utY2nmszY= X-Received: by 2002:a17:906:7687:: with SMTP id o7mr21507828ejm.209.1607389748824; Mon, 07 Dec 2020 17:09:08 -0800 (PST) MIME-Version: 1.0 Date: Mon, 7 Dec 2020 17:08:58 -0800 Message-ID: Subject: libgo patch commited: Don't use AF_LINK on Hurd To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ian Lance Taylor via Gcc-patches From: Ian Lance Taylor Reply-To: Ian Lance Taylor Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This libgo patch by Svante Signell fixes the libgo build by not using AF_LINK on Hurd systems. This fixes GCC PR 98153. Bootstrapped and ran Go tests on x86_64-pc-linux-gnu. Committed to mainline. Ian eafa578e83e4d4f5e29e7e69e9701b4c55e3bd02 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 711353d2550..d4c8e30d1b4 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -81687fccc568a088fee8f627ddde599e17c648c2 +3363fc239f642d3c3fb9a138d2833985d85dc083 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/syscall/socket_bsd.go b/libgo/go/syscall/socket_bsd.go index b230a3212e6..983d554849b 100644 --- a/libgo/go/syscall/socket_bsd.go +++ b/libgo/go/syscall/socket_bsd.go @@ -4,7 +4,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build darwin dragonfly freebsd hurd openbsd netbsd +// +build darwin dragonfly freebsd openbsd netbsd package syscall diff --git a/libgo/go/syscall/socket_hurd.go b/libgo/go/syscall/socket_hurd.go new file mode 100644 index 00000000000..fcb239ef1ca --- /dev/null +++ b/libgo/go/syscall/socket_hurd.go @@ -0,0 +1,101 @@ +// socket_hurd.go -- Socket handling specific to GNU/Hurd based systems. +// This file is derived from socket_bsd.go without SockaddrDatalink since +// AF_LINK is not yet supported on GNU/Hurd. + +// Copyright 2010 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build hurd + +package syscall + +import "unsafe" + +const SizeofSockaddrInet4 = 16 +const SizeofSockaddrInet6 = 28 +const SizeofSockaddrUnix = 110 + +type RawSockaddrInet4 struct { + Len uint8 + Family uint8 + Port uint16 + Addr [4]byte /* in_addr */ + Zero [8]uint8 +} + +func (sa *RawSockaddrInet4) setLen() Socklen_t { + sa.Len = SizeofSockaddrInet4 + return SizeofSockaddrInet4 +} + +type RawSockaddrInet6 struct { + Len uint8 + Family uint8 + Port uint16 + Flowinfo uint32 + Addr [16]byte /* in6_addr */ + Scope_id uint32 +} + +func (sa *RawSockaddrInet6) setLen() Socklen_t { + sa.Len = SizeofSockaddrInet6 + return SizeofSockaddrInet6 +} + +type RawSockaddrUnix struct { + Len uint8 + Family uint8 + Path [108]int8 +} + +func (sa *RawSockaddrUnix) setLen(n int) { + sa.Len = uint8(3 + n) // 2 for Family, Len; 1 for NUL. +} + +func (sa *RawSockaddrUnix) getLen() (int, error) { + if sa.Len < 2 || sa.Len > SizeofSockaddrUnix { + return 0, EINVAL + } + + // Some BSDs include the trailing NUL in the length, whereas + // others do not. Work around this by subtracting the leading + // family and len. The path is then scanned to see if a NUL + // terminator still exists within the length. + n := int(sa.Len) - 2 // subtract leading Family, Len + for i := 0; i < n; i++ { + if sa.Path[i] == 0 { + // found early NUL; assume Len included the NUL + // or was overestimating. + n = i + break + } + } + return n, nil +} + +func (sa *RawSockaddrUnix) adjustAbstract(sl Socklen_t) Socklen_t { + return sl +} + +type RawSockaddr struct { + Len uint8 + Family uint8 + Data [14]int8 +} + +// BindToDevice binds the socket associated with fd to device. +func BindToDevice(fd int, device string) (err error) { + return ENOSYS +} + +func anyToSockaddrOS(rsa *RawSockaddrAny) (Sockaddr, error) { + return nil, EAFNOSUPPORT +} + +func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) { + var value IPv6MTUInfo + vallen := Socklen_t(SizeofIPv6MTUInfo) + err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen) + return &value, err +}