From patchwork Mon Nov 30 20:24:48 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: 1408471 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=bZ2ZkIhe; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [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 4ClGts6n3bz9sVk for ; Tue, 1 Dec 2020 07:25:09 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EEE8D393C86E; Mon, 30 Nov 2020 20:25:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EEE8D393C86E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1606767906; bh=bhibhBLa2L9NPVpXNJzkwWFnycQhBrlSADPrHMpjONU=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=bZ2ZkIheDU0KPRLt8aHaK7Wz4sQ2mu6C2WZFPAQAAmgXAVzPwOBq/5XPVuEiJTofN fino0aU4CPurlW7NbdDztUtpFWXV17d3nj6Zm9Jx6Xaxf6dA2cowlzs0nqTqZVuHX+ HDBCLt6Pt9Xgs6YfZ0esUWC3bsoPtA+4J7KVLrLU= 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 BDB633896C0E for ; Mon, 30 Nov 2020 20:25:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BDB633896C0E Received: by mail-ej1-x62b.google.com with SMTP id a16so24404990ejj.5 for ; Mon, 30 Nov 2020 12:25:01 -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=bhibhBLa2L9NPVpXNJzkwWFnycQhBrlSADPrHMpjONU=; b=A4AyyH0ZbTbB/lMS66QMTbryVRIyAB0ymbUbI+1puMcVXuBG4elKq/b5zmjS6ItZNY fgoCN1Qesh9p2QHBVcwQ5rI7wvPeMm1O8ngP95sQ1tko+MnSROzeTPSit6pIvV13tPFY ULQahRq3XNOwXEPOwVIjSDQC/tAfzfEuG9qUcQOHW83Md1t3z1iLO4ZnJCP+dxLh3cJ1 Utkww/tr5BVF6KsiDH4P0WudYxjysxIL5GvNRPoZ0/sdBhL0nmXInQnvvfTPVQJF2LWh Ac9wBQX0LYObF3BB1Y1KlcZ209BZzOrEyD3TPrwa9SMvsXTwpSAk4t4/F3nvbfsMcPtI lvLg== X-Gm-Message-State: AOAM531rJHTUYkSWMpA5efvPG81VNw082RWFHwbj79u9ZvuVItyHQYIV 6jIsb7fWCLtH3FCOu8LYUyAEWekAbbAl21Ya6Jg0u9JTg2LKhg== X-Google-Smtp-Source: ABdhPJyWPYKTHpOnmRXrf9gU2tgCpDPCK00NaCFGzZFRy2DPGOC3EqM4lBqfDBcXrWoaig9iM82wv5eTEuauy9pvxZ0= X-Received: by 2002:a17:906:3608:: with SMTP id q8mr22791520ejb.39.1606767900559; Mon, 30 Nov 2020 12:25:00 -0800 (PST) MIME-Version: 1.0 Date: Mon, 30 Nov 2020 12:24:48 -0800 Message-ID: Subject: libgo patch committed: Don't define CacheLinePadSize for mips64x 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 changes the internal/cpu package to not define CacheLinePadSize for mips64x. For libgo the definition always comes from the generated file cpugen.go. This fixes GCC PR 98041. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian eafb46ce90c23efd22c61d941face060bb9f11f3 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index eec3d0708e5..45f62b3bec5 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -84506e0f6bf282765856cb5aeb17124222f73042 +2cc5c746ddfbaeb731f10f2232b9a488df12b71e 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_mips64x.go b/libgo/go/internal/cpu/cpu_mips64x.go index 0c4794a70ac..af10a5071ea 100644 --- a/libgo/go/internal/cpu/cpu_mips64x.go +++ b/libgo/go/internal/cpu/cpu_mips64x.go @@ -6,8 +6,6 @@ package cpu -const CacheLinePadSize = 32 - // This is initialized by archauxv and should not be changed after it is // initialized. var HWCap uint