From patchwork Wed Jan 22 19:15:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1227399 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-518054-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.a=rsa-sha1 header.s=default header.b=teZALc+L; 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.a=rsa-sha256 header.s=20150623 header.b=vcrFIOfB; 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 482w9T3MjCz9sQp for ; Thu, 23 Jan 2020 06:15:55 +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=AXes26+XDSywT8QnSRhNMqHkd6zFfifh70OjDePJaxCr+j M3/JBy4a2uvMnA4xzEQoZjh0DFkHlUWB+CPImDiqbEDJ0Pp64DhJNmvObzMxXLHO S4cBLU+xpvHZW8/YPOMh7vGs/tkUo9CoOPJMzvhW/OiVXnPvyTVEu92a8jUKQ= 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=6OGmwxjvED6R4qicA0ai43rLk94=; b=teZALc+LWN/RsiILfSgz FQzGMgPoyOXHt5B1HMwt1J85F2kIxLl/uzK0CGJcZ01FMxSI/YsgnBTim2Q1CA0J WO2YwbbW43IG0hnFtSeJae2zZ97yiAf1d2CNWbTKtZlAkwqA4aistJZJdKFdAD8Q 3ZawXEiRPwM453NLq/wGd5U= Received: (qmail 85139 invoked by alias); 22 Jan 2020 19:15:45 -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 84952 invoked by uid 89); 22 Jan 2020 19:15:28 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=8:e, 8:tr, 8:as, 8:an X-HELO: mail-ed1-f53.google.com Received: from mail-ed1-f53.google.com (HELO mail-ed1-f53.google.com) (209.85.208.53) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 22 Jan 2020 19:15:26 +0000 Received: by mail-ed1-f53.google.com with SMTP id b8so706956edx.7 for ; Wed, 22 Jan 2020 11:15:16 -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=0fQ3WcPbKKQouD0Ss+7zy+RRXCUVrobzhVmi51ackJE=; b=vcrFIOfBC7dovfvNkxrDFXOKbukSdvEWBN4psHCfqse7IJ/gv/BTi12bIRhGZugLWq kvfKM+ymSglcKOYw9ToAFinUK8hZyntMxDkaZBq/wSm1OoWSZ0IpO6EZG2lwhJdkKSC3 lveEgCDg78eET0Yf1gukeD/U6Jqnti6SVOiL9R69mxP9ovilYyyFp5z/vbGguquLCtWI o/4b6JiaL8zlI91cSCK6x9rB1PKG3EtUTqGMxS1hdfq0HA8BFSGGv8L0zBGveuCzOYcD CSWb9ZiEMK66/4dLUpK0z1VtZJX96JOg7SH/CBKv1yKeSfyIkob//R/2t0VyU3xQegIL 7Zcw== MIME-Version: 1.0 From: Ian Lance Taylor Date: Wed, 22 Jan 2020 11:15:03 -0800 Message-ID: Subject: libgo patch committed: Update runtime_nanotime call To: gcc-patches , gofrontend-dev In the update of libgo to Go1.14beta1, the function runtime_nanotime was renamed to runtime_nanotime1. I missed one reference that is not compiled on x86 code. This patch fixes that. This fixes https://golang.org/issue/36694. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index dff5fb5bc70..61f01d739ff 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -c2225a76d1e15f28056596807ebbbc526d4c58da +94a5ff53df24c58c5e6629ce6720a02aa9986322 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/runtime_c.c b/libgo/runtime/runtime_c.c index e7951a051a6..18222c14465 100644 --- a/libgo/runtime/runtime_c.c +++ b/libgo/runtime/runtime_c.c @@ -97,7 +97,7 @@ runtime_cputicks(void) // Currently cputicks() is used in blocking profiler and to seed runtime·fastrand(). // runtime·nanotime() is a poor approximation of CPU ticks that is enough for the profiler. // randomNumber provides better seeding of fastrand. - return runtime_nanotime() + randomNumber; + return runtime_nanotime1() + randomNumber; #endif }