From patchwork Thu Sep 19 00:03:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1164248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-509238-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.b="clWgRigJ"; 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.b="q5ti/qs3"; 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 46YcWq0Xwdz9sCJ for ; Thu, 19 Sep 2019 10:03:48 +1000 (AEST) 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=fTM9h5LEF+Bc47ZaRC6HvO9lRcpdkw3LENdjBGpiMeyLsl g+NHLs54Qhx/ZEMghQngOExb1dgOCYGmuZSpaCyTUUVxOB0c/k2/pRT68hQ6KGRR QOVuwBgrVrRNnCnx5P2ip0a76LqPngf+mXd2qLBhpr7achvs16U/lwL2qp+fI= 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=JUZlEFRwUzAQfeT1l6A0Hp+rdms=; b=clWgRigJg2o6mN1mL6vu EdzFUR/vKyji+8Dy+s1AEOiZszi2Qf9lO5bRYx+9ObsYLueiTKDsu5wU2g0iiSeu KtaZqaFlSPOe5BBKOMTkCBvU3DTEcZ1eRRYP+SX0DEwrP7owarlx3XmJmyMVDaPy vMA1SnZdGNFipNX6k3gsy0o= Received: (qmail 46951 invoked by alias); 19 Sep 2019 00:03:41 -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 46935 invoked by uid 89); 19 Sep 2019 00:03:41 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=gofrontend, HX-Received:7089, HX-HELO:sk:mail-ed, H*r:sk:mail-ed X-HELO: mail-ed1-f50.google.com Received: from mail-ed1-f50.google.com (HELO mail-ed1-f50.google.com) (209.85.208.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 19 Sep 2019 00:03:40 +0000 Received: by mail-ed1-f50.google.com with SMTP id p10so1559097edq.1 for ; Wed, 18 Sep 2019 17:03:39 -0700 (PDT) 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=8VwufV8fn57Oyw31Vy4uH0hI9d8j483dJ7Qn0yOg5Ho=; b=q5ti/qs34Fw703QcdIB6MOLsQh+w08x51EAi3+zXE43JhNuP9Bon2VaeZXKokIXwO9 BOzhDyEV5MXdfstxuRJJixpOxleIBRRZI1kd2mHCnsxw+hi+9S56/HC4zPw/51O86Mgt wI367awPCRXT3gIlLz3LluMl5tY1xoR6nJ2UF/pa5BXvScfUqNRNRQf1Taluk5nJ0SRF qiSC9UNsbuvuyaHjzXvRTkRntC5hgr3BcZaehcoF/C9B2TTiuNfEFdKUGKTp5FcT9nf6 lC/m9Ten5zm/4gD79JBIKsoQ1C7u9MdqJhqeDwo4aOehxKGP5dgqT+cVsPBREG7qm700 L3XQ== MIME-Version: 1.0 From: Ian Lance Taylor Date: Wed, 18 Sep 2019 17:03:26 -0700 Message-ID: Subject: libgo patch committed: Fixes for arm64 GoLLVM build To: gcc-patches , gofrontend-dev This libgo patch by Xiangdong JI is for the GoLLVM build on arm64 GNU/Linux. It incorporates a type definition of 'uint128' to 'runtime' and 'syscall' packages. This fixes https://golang.org/issue/33711. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian Index: gcc/go/gofrontend/MERGE =================================================================== --- gcc/go/gofrontend/MERGE (revision 275814) +++ gcc/go/gofrontend/MERGE (working copy) @@ -1,4 +1,4 @@ -09ca3c1ea8a52b5d3d6c4331c59d44e0b6bfab57 +d81ff42c367cce2110ccf5ddbadb6cc9bdf94e28 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. Index: libgo/mkrsysinfo.sh =================================================================== --- libgo/mkrsysinfo.sh (revision 275698) +++ libgo/mkrsysinfo.sh (working copy) @@ -209,3 +209,9 @@ grep '^type _kevent ' gen-sysinfo.go | \ sed -e s'/_kevent/keventt/' \ -e 's/ udata [^;}]*/ udata *byte/' \ >> ${OUT} + +# Type 'uint128' is needed in a couple of type definitions on arm64,such +# as _user_fpsimd_struct, _elf_fpregset_t, etc. +if ! grep '^type uint128' ${OUT} > /dev/null 2>&1; then + echo "type uint128 [16]byte" >> ${OUT} +fi Index: libgo/mksysinfo.sh =================================================================== --- libgo/mksysinfo.sh (revision 275698) +++ libgo/mksysinfo.sh (working copy) @@ -1393,4 +1393,10 @@ grep '^type _mactun_info_t ' gen-sysinfo sed -e 's/_in6_addr_t/[16]byte/g' \ >> ${OUT} +# Type 'uint128' is needed in a couple of type definitions on arm64,such +# as _user_fpsimd_struct, _elf_fpregset_t, etc. +if ! grep '^type uint128' ${OUT} > /dev/null 2>&1; then + echo "type uint128 [16]byte" >> ${OUT} +fi + exit $? Index: libgo/sysinfo.c =================================================================== --- libgo/sysinfo.c (revision 275698) +++ libgo/sysinfo.c (working copy) @@ -424,7 +424,11 @@ EREF(MNT_FORCE); #if defined(HAVE_SYS_PTRACE_H) // From +#if defined (__aarch64__) +SREF(user_pt_regs); +#else SREF(pt_regs); +#endif EREF(PTRACE_PEEKTEXT); #endif