From patchwork Mon Nov 30 20:17:30 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: 1408469 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=2620:52:3:1:0:246e:9693:128c; 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=suPbZmLA; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4ClGkc3V7Nz9sVq for ; Tue, 1 Dec 2020 07:18:00 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EC136393C867; Mon, 30 Nov 2020 20:17:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC136393C867 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1606767467; bh=7EaPUGSBwWyxci8OhwB7FtMPMrnDezj9pQ9NAwsC0Rc=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=suPbZmLABQKEaW89PAG/50QcUUndJX06GoKzWRhG8vzIacA3ToSTLsrV7nc84prOO jB5CKJIKgwN1u1jOIsj2g1teruTut+aGlYs8bJrS4otvV7suklzwokugtgC8TldiHH 9HdGnYrNCxsz8xUqsFFm9XliShsef7WElUF3w8iY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id 50296393C85E for ; Mon, 30 Nov 2020 20:17:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 50296393C85E Received: by mail-ej1-x62b.google.com with SMTP id 7so24385657ejm.0 for ; Mon, 30 Nov 2020 12:17:44 -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=7EaPUGSBwWyxci8OhwB7FtMPMrnDezj9pQ9NAwsC0Rc=; b=gTcW8+GNvZsvvqm1Etruk6wIz52Ff+Ql4DWvN9p0S//6pDMgWuRAROhUt241yISXSL LeZDQU4Vu9xc0OK+hv5vAehT99MmP+DU0VbTO2pxqoH83cwJD/uWfFImPw1RtC/ZKjav CDbUYFWoOAWgglEl6fl488PIkXBa2FJHHkDnz9gxMCTiFIn8r6MHRXqkOEn1MBodmIQO W6dA6c2tSqIWippdxrNQnYC4l6SiCSIYIPIIpj498IdQYuBb5sL+Ep1htu0+YqblnGUz 4eooFIZRJYeOtH/goJrWfXhwe4eCvNNf5N6TcHVYUJqUA4QAI65U16MHGKpRnIAR7uDE x5xQ== X-Gm-Message-State: AOAM532C7yYgLos/UXOtERthTViu3slG5UelToFMlWzzc0ooKyO2RxGz uHvwQIKjO0Ay/4c0BWBY1W8FqO64T1uXO5iv+nPmcIXeU6gEng== X-Google-Smtp-Source: ABdhPJz/du4+sXmdTAqjiVpsuJ2j53acjV3pV+8FbGa7XJWYvAYXotLS0weoON7yS2bb2QXrt2cI4uFP0KV/ilsvsPc= X-Received: by 2002:a17:907:20dc:: with SMTP id qq28mr20842546ejb.403.1606767462774; Mon, 30 Nov 2020 12:17:42 -0800 (PST) MIME-Version: 1.0 Date: Mon, 30 Nov 2020 12:17:30 -0800 Message-ID: Subject: libgo patch committed: Define SO_RCVTIMEO on 32-bit GNU/Linux To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-11.5 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 defines SO_RCVTIMEO on 32-bit GNU/Linux. It was not being defined before because it is defined as a conditional expression that is too complicated for -fdump-go-spec to handle. This fixes https://golang.org/issue/42872. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian e848a83f46f15280ad654f05545cc5ec4f5b8e50 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 41246030f13..e8cf468d8fc 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -45461eeba1db1a3b4194dc8ecc331c0e92f5ad4c +be1738f1fff0e817d921ed568791f9b0585a6982 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh index deac5ce8d67..b32a0266b71 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -194,6 +194,7 @@ fi # Networking constants. egrep '^const _(AF|ARPHRD|ETH|IN|SOCK|SOL|SO|IPPROTO|TCP|IP|IPV6)_' gen-sysinfo.go | + grep -v '_val =' | sed -e 's/^\(const \)_\([^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} grep '^const _SOMAXCONN' gen-sysinfo.go | sed -e 's/^\(const \)_\(SOMAXCONN[^= ]*\)\(.*\)$/\1\2 = _\2/' \ @@ -213,6 +214,14 @@ for m in SOCK_CLOEXEC SOCK_NONBLOCK; do fi done +# On 32-bit GNU/Linux the expression for SO_RCVTIMEO is too complicated +# for -fdump-go-spec. +if ! grep '^const SO_RCVTIMEO ' ${OUT} >/dev/null 2>&1; then + if grep '^const _SO_RCVTIMEO_val' ${OUT} >/dev/null 2>&1; then + echo 'const SO_RCVTIMEO = _SO_RCVTIMEO_val' >> ${OUT} + fi +fi + # The syscall package requires AF_LOCAL. if ! grep '^const AF_LOCAL ' ${OUT} >/dev/null 2>&1; then if grep '^const AF_UNIX ' ${OUT} >/dev/null 2>&1; then diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c index 7086381a14c..a060ea867a5 100644 --- a/libgo/sysinfo.c +++ b/libgo/sysinfo.c @@ -337,6 +337,9 @@ enum { #ifdef BIOCVERSION BIOCVERSION_val = BIOCVERSION, #endif +#ifdef SO_RCVTIMEO + SO_RCVTIMEO_val = SO_RCVTIMEO, +#endif }; // SIOCGIFMTU can't be added in the above enum as it might