From patchwork Wed Jul 13 16:02:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 238 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a98:d5ce:0:b0:178:cc93:bf7d with SMTP id g14csp332819eik; Wed, 13 Jul 2022 09:03:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vkMLgQUnMdlqpx4XT3bUteOZT3diSuHKb7J8xgHDtwwJ7HESn94yMiQj1z4N7lwGhKilIF X-Received: by 2002:a17:907:75e3:b0:72b:198a:b598 with SMTP id jz3-20020a17090775e300b0072b198ab598mr4319129ejc.401.1657728209917; Wed, 13 Jul 2022 09:03:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657728209; cv=none; d=google.com; s=arc-20160816; b=NBjycY328kGZxhw5fnWzhL8SEqVdGClQXKdvZIrupQTB/c9rvN4M7R087dbfwAE03a FWMemCWdgwJbUt8nl2QHhaqcFF9lLu9MvwTbZISRvVIz0oPSA/Ka+3B9CVPBCb01glk/ gG/F2Pi7e/g+MAcg0zTAJ3WkcBDTfQm//yKK9Jv3v5ENKBUcR2u84j/8IhN49SG0qxdY f8FsRZ7E4wzSu5iDFfrkIO6762JsoN1pkXK3PB6yvAQvYsn1GlbwKXXcaDPd5Tba92RM 2wvnYKshMY9POpCRrToVijwFnVSm7AdIFrT8U1KtKOMwRG9agX7d97F0ZulOPVuvIVeZ mwTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:to:subject :message-id:date:mime-version:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=HOnFnOVSG+UGiu8Dbbk8Ls7ZE3pifvqzs7TlESJ6J6o=; b=skg23dPGYkjnzdk4C1tf13+xmVHLMwD3el2Quiyy/Ld2VBwbkPEStGFC7JRSZ/hL/s Dz5nH3b+XXMy6J+pQFFlPH8W+bddVLDLzdIGDNl98tObPdV6pXAeoDDPwuDug2iaIFm4 /WqN/6JZdqAFLPajyzrL4x0RUh2S+pPOELc9K8+ME7nWPIT8GR/C7+Boz+dn7wUNcxsF mdvx/U82AnHDRnABA06QmRALrw/VV6WhPspPlc0QfSw+h7McmmoNawLpWsWg2UDl9KV/ 3YJVLS8sXvPBqeSiYo2DZnWMXpsMMlnkIhkEP7+Ot7h+wIOVNHczP8aXwGPOslaDjxa0 7pDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=x+A7WUON; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id co6-20020a0564020c0600b0043a71e0c8d4si16528322edb.256.2022.07.13.09.03.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 09:03:29 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=x+A7WUON; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B49933838F37 for ; Wed, 13 Jul 2022 16:03:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B49933838F37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1657728208; bh=HOnFnOVSG+UGiu8Dbbk8Ls7ZE3pifvqzs7TlESJ6J6o=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=x+A7WUONviI+Ureqz13iPg/WTrMGXzUHaCez/XyAhgK2ZBlhSJMAQsBHYPrfp1E1W DzxHa84qPoFMGxIH2MeDiJLA5LZlMc0HcNCt1ubOpt9ONOy3yb/k+/N6gK6XcrSc6r jnrmlhQCwCEWkzyCgqhRhCXPy0ARFd6h1n6Gps+Y= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id 94CBD3838F14 for ; Wed, 13 Jul 2022 16:02:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 94CBD3838F14 Received: by mail-pf1-x429.google.com with SMTP id v7so8563325pfb.0 for ; Wed, 13 Jul 2022 09:02:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=HOnFnOVSG+UGiu8Dbbk8Ls7ZE3pifvqzs7TlESJ6J6o=; b=yhjeH3ytOwOK/Om7johJydqJ0nlDgbM0bSsGtfmbKbPo556RskmYA1+SXqHpZ1fsZD cjTgpAWoPmK5kxXfs5Im1jaCJxyl/lUsDcdrApIezyYdfQNupcqjsULLxcbJDYZsngVz UcI/CGKc3UEFogmTJ6k8v7LfqdG4RH8mo58Os9EQ5i7cu08In2286sDiJd+fC0PokMrP uamiuzLaAoGeJ4D6imJeRuCDCvGOSHSiGE5WpvycY24E1DO00t0/8eVxqMAsuV1XndD/ 9Q3HZvt43hH7vO+NiGGsaQndt012UhIPPpHG/SQ0Yey87ySwF0zpPd7j+NqGTOzcajPL V6Eg== X-Gm-Message-State: AJIora+5Brw8TJvGaOsMrBVkrXEpVCqZkBVnhXoNi7giFH0HW5mz+eQW e3nbH7l4QRmSVmLp7DAnr+Wv83aHO7xhvPEjjig5Px1Wn5RQOg== X-Received: by 2002:a05:6a00:23d4:b0:52a:e5c1:caa7 with SMTP id g20-20020a056a0023d400b0052ae5c1caa7mr3748999pfc.62.1657728164039; Wed, 13 Jul 2022 09:02:44 -0700 (PDT) MIME-Version: 1.0 Date: Wed, 13 Jul 2022 09:02:32 -0700 Message-ID: Subject: libgo patch committed: Don't include in sysinfo.c To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1738254015224529902?= X-GMAIL-MSGID: =?utf-8?q?1738254015224529902?= This libgo patch stops including when building gen-sysinfo.go. Removing this doesn't change anything at least with glibc 2.33. The include was added in https://go.dev/cl/6100049 but it's not clear why. This should fix GCC PR 106266. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian 9b487dbc298242fdde127e7827e728545c308aac diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 7c5c45672d7..5ea0406cd8e 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -d295a0a2c96c0f7c3abd94fea3aa4e2303bf2af2 +ff68b1a147eb60082fd60c198db0ef5477ade938 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c index a4259c02ded..fc0210992fa 100644 --- a/libgo/sysinfo.c +++ b/libgo/sysinfo.c @@ -158,9 +158,6 @@ #if defined(HAVE_LINUX_ETHER_H) #include #endif -#if defined(HAVE_LINUX_FS_H) -#include -#endif #if defined(HAVE_LINUX_REBOOT_H) #include #endif