From patchwork Fri Dec 4 22:51:17 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: 1411304 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=oVyLCgzH; dkim-atps=neutral Received: from sourceware.org (unknown [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 4Cnnxx3qMgz9s0b for ; Sat, 5 Dec 2020 09:51:33 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 314BD397A006; Fri, 4 Dec 2020 22:51:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 314BD397A006 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1607122291; bh=fgjaqnab9wCe6O/+AbOs8DW8g0/j2YFLA3ymXJsEeOc=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=oVyLCgzHDWyxV15d1fP2jrIwwSMFU4klZLW6Ic8ARQS0NoaxlT/8raLe5W3bv68el mfhki/Mqkq1KYvELNdpR0OJK5uwXq7RjW3CP844Ca/bMIKEWDE/PRRsVHE6zHj2in6 E8eU/hsjvCISt5reorkSckm0++7kbjdIg//KN7zQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id 43EF6384BC14 for ; Fri, 4 Dec 2020 22:51:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 43EF6384BC14 Received: by mail-ej1-x634.google.com with SMTP id a16so10996923ejj.5 for ; Fri, 04 Dec 2020 14:51:29 -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=fgjaqnab9wCe6O/+AbOs8DW8g0/j2YFLA3ymXJsEeOc=; b=fw1tdCOIS6GkGjA3VBldAAeh5J1vrb/CzhOenRymX3NxqYjyhQFWEyTSTX6lm7wXAU 5wiinQaEuKwV6+AkW5KC4J8mdkg6ON6iyIQwTGLtC3SPIVp67orPj/6g3HquUd0Mqidp I+Lx75rT8vAGlc/JQ/tYk5+dts8BafBYXFLCdMKB5o1hr1kNTTvMibh9hnDuEZO5+26e 9sy8wusa31cgUNXAUVDu26VtwR/hCNZ6wG2gA9fGjiOmQIx07gWSKfPiJK5AGJ2Dbg0M 6HoD5129STMFLaAiYz7Dxr6duuS7Ecgtp939VOouEJXdK+xdBd4XdxygphkWZVkK3Ag2 uAXA== X-Gm-Message-State: AOAM532NPi3F6DEFCUuhDzSYb7qF0D5JSrkfGcc+2g9s2UEa2/lnNAso OEb5M47h/oAtjh3t9ZbuC1qqWIPEU7FOgPwyGr4vHyU95JxFEQ== X-Google-Smtp-Source: ABdhPJymrDMluBkpkISh3li6P+l0da00FOy9sEB1JIjDD6qe/BiZW9IbH6LwV/Ygl3PpAwoacAoZTI4DFGy+FSpnLEg= X-Received: by 2002:a17:906:68c4:: with SMTP id y4mr9491536ejr.332.1607122288110; Fri, 04 Dec 2020 14:51:28 -0800 (PST) MIME-Version: 1.0 Date: Fri, 4 Dec 2020 14:51:17 -0800 Message-ID: Subject: libgo patch committed: Update type descriptor name in fieldtrack C code To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-12.2 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 updates the type descriptor name in the fieldtrack C support code. We were using the old name, but nothing noticed because it is a weak reference that is permitted to be nil, so that it works with code that does not use the field tracking library. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian 4ae5e581336d9e113b61cf7d014d49bf0cd037f3 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index cd1a3961a06..019aafdde9a 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -b3a0b068f7fa2d65ba781271b2c0479d103b7d7b +342e5f0b349553a69d7c99a18162ae2a1e6e5775 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/go-fieldtrack.c b/libgo/runtime/go-fieldtrack.c index 22f091be3f4..80be27ca5e3 100644 --- a/libgo/runtime/go-fieldtrack.c +++ b/libgo/runtime/go-fieldtrack.c @@ -31,7 +31,7 @@ extern void *mapassign (const struct maptype *, void *hmap, const void *key) // The type descriptor for map[string] bool. */ extern const char map_string_bool[] __attribute__ ((weak)); extern const char map_string_bool[] - __asm__ (GOSYM_PREFIX "type..map.6string.7bool"); + __asm__ (GOSYM_PREFIX "type..map_6string_7bool"); void runtime_Fieldtrack (void *) __asm__ (GOSYM_PREFIX "runtime.Fieldtrack");