From patchwork Sat Jan 30 00:12:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1433565 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; 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=uG1PNw/L; 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 4DSF6P6FXSz9srZ for ; Sat, 30 Jan 2021 11:13:15 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C24813857819; Sat, 30 Jan 2021 00:13:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C24813857819 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1611965592; bh=JBAhDMLjiKh8S+TkVeAAln5TPi5HA7yBRvutacKh9eg=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=uG1PNw/LLLjjrxs0H57lb8AbWrPrYXUMJnJYdyjAOxa0PGw9fPUffe13L5IMzTQmW +HEZ8RsE4m1Z6msBIrANIQYKsmRSMOvfBP6G4nutBd6SrwzTzQKGthQHztMrrWbM0X 1+S5iBuzXWDLUFpxGljooj7vCrU+7UVA32YHrw4I= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by sourceware.org (Postfix) with ESMTPS id 6D7A5385800B for ; Sat, 30 Jan 2021 00:13:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6D7A5385800B Received: by mail-ed1-x534.google.com with SMTP id g1so12569972edu.4 for ; Fri, 29 Jan 2021 16:13: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=JBAhDMLjiKh8S+TkVeAAln5TPi5HA7yBRvutacKh9eg=; b=gmuhTRZvc1vmUCs/zD6I4wEshtWGjDSv11YUM7zmiJzedSbYSsJNII+6TZLSuhvgcd 21mExBYB1sjjurzQjpr4VU06bImv4wOWsQSCne+btihk2aYsb/1Rfg2IOsqAQ71QbarG cObWmoHTBaEUYy2zjOgMq8v0/mZ4XB/Xbmh6wpaKFdE4C0ez34x2BilER01wVy/joEaJ 1+IB25aLqLFUzf4MaN0qWM1VgiEwKQJ1J+ajmXkU0OgP5hMozR0TtFxWewNXBc9AiJLo R74Lm1KATyv802CkSYayjAXe3KmKKfou5rUbChtECQMH20XnFPnIrppsiV7jJi/kYkzu jcEA== X-Gm-Message-State: AOAM533+1sQaGVQCyjML+LiFnuJ1k2sKsl9CyV5FY3t3EIdMlbW8zytN AM2YO108ZBWlwUS9Q/edFbGl3hrod+D/ipdhmLrTya+MtaD1qw== X-Google-Smtp-Source: ABdhPJzRS5V2cgcow1gO1Pja9X5Yx8Ixj8iM4kYnzpWE9MkR/OyoX1sFhhpk/st4D1/QChg6EAd76uc+8JQMUVDbf5c= X-Received: by 2002:a50:c34b:: with SMTP id q11mr8036254edb.173.1611965588294; Fri, 29 Jan 2021 16:13:08 -0800 (PST) MIME-Version: 1.0 Date: Fri, 29 Jan 2021 16:12:57 -0800 Message-ID: Subject: libgo patch committed: Correct reference to getsystemcgf 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 by Clément Chigot directly sets getsystemcfg as //extern in internal/cpu instead of trying to use the runtime as in Go toolchain. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian 7da2394fc591a3fb236190c8712f3960a4ee8e5f diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 366fcf02885..cb12c83a700 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -2663206528a6d46cbde60dbccf84c8288707ab8d +271a043537f2f0ae93bde2cf4f4897e68a476ece 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/internal/cpu/cpu_ppc64x_aix.go b/libgo/go/internal/cpu/cpu_ppc64x_aix.go index a932684baf2..e2422a6ddaa 100644 --- a/libgo/go/internal/cpu/cpu_ppc64x_aix.go +++ b/libgo/go/internal/cpu/cpu_ppc64x_aix.go @@ -17,5 +17,5 @@ func osinit() { PPC64.IsPOWER9 = isSet(impl, _IMPL_POWER9) } -// getsystemcfg is defined in runtime/os2_aix.go +//extern getsystemcfg func getsystemcfg(label uint) uint diff --git a/libgo/go/runtime/os_aix.go b/libgo/go/runtime/os_aix.go index 630a1c22d7f..d902ae04dc9 100644 --- a/libgo/go/runtime/os_aix.go +++ b/libgo/go/runtime/os_aix.go @@ -13,9 +13,6 @@ import ( //extern sysconf func sysconf(int32) _C_long -//extern getsystemcfg -func getsystemcfg(int32) uint64 - type mOS struct { waitsema uintptr // semaphore for parking on locks }