From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 126498 invoked by alias); 27 Jun 2017 07:52:27 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 126433 invoked by uid 89); 27 Jun 2017 07:52:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=letters X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0a-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.156.1) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 27 Jun 2017 07:52:23 +0000 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5R7qF4T006304 for ; Tue, 27 Jun 2017 03:52:22 -0400 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0a-001b2d01.pphosted.com with ESMTP id 2bb564739w-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 27 Jun 2017 03:52:21 -0400 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 27 Jun 2017 08:52:17 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 27 Jun 2017 08:52:15 +0100 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v5R7qEOW38404130; Tue, 27 Jun 2017 07:52:14 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5287BA4051; Tue, 27 Jun 2017 08:49:51 +0100 (BST) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 27A08A4053; Tue, 27 Jun 2017 08:49:51 +0100 (BST) Received: from [9.152.212.134] (unknown [9.152.212.134]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 27 Jun 2017 08:49:51 +0100 (BST) From: Andreas Krebbel Subject: [PATCH, go]: S/390: Fix generation of PtraceRegs To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Date: Tue, 27 Jun 2017 07:52:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------9C00AC3CB27B93ED464C14D9" X-TM-AS-GCONF: 00 x-cbid: 17062707-0020-0000-0000-0000039232DF X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17062707-0021-0000-0000-000042141C24 Message-Id: <0f1319c4-e896-ae22-3a5d-c563a5292d8c@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-06-27_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1706270127 X-IsSubscribed: yes X-SW-Source: 2017-06/txt/msg01982.txt.bz2 This is a multi-part message in MIME format. --------------9C00AC3CB27B93ED464C14D9 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 1002 Hi, go bootstrap fails on s390x starting with r249472. With including the ptrace header the s390 special code in mksysinfo.sh isn't used anymore: if test "$regs" = ""; then # s390 regs=`grep '^type __user_regs_struct struct' gen-sysinfo.go || true` if test "$regs" != ""; then # Substructures of __user_regs_struct on s390 upcase_fields "__user_psw_struct" "PtracePsw" >> ${OUT} || true upcase_fields "__user_fpregs_struct" "PtraceFpregs" >> ${OUT} || true upcase_fields "__user_per_struct" "PtracePer" >> ${OUT} || true fi fi Instead we fall through to the code with the generic handling which appears to work fine. The only difference is that the former code used to uppercase the initial letters of the struct member while the generic handler doesn't. The only user however appear to be syscall_linux_s390(x).go. The attached patch removes the mksysino.sh S/390 specific handling and adjusts the syscall_linux_s390* file accordingly. This fixes the bootstrap on s390x. --------------9C00AC3CB27B93ED464C14D9 Content-Type: text/plain; charset=UTF-8; name="gcc-gofix" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="gcc-gofix" Content-length: 3262 Y29tbWl0IGUyOTAzZGI2Y2NhMGE5N2MzMzIwY2U1OGVjMTQwNWNjM2JlZGI1 YzIKQXV0aG9yOiBBbmRyZWFzIEtyZWJiZWwgPGtyZWJiZWxAbGludXgudm5l dC5pYm0uY29tPgpEYXRlOiAgIE1vbiBKdW4gMjYgMTY6NTA6MDMgMjAxNyAr MDIwMAoKICAgIFMvMzkwOiBGaXggZ28gYm9vdHN0cmFwCgpkaWZmIC0tZ2l0 IGEvbGliZ28vZ28vc3lzY2FsbC9zeXNjYWxsX2xpbnV4X3MzOTAuZ28gYi9s aWJnby9nby9zeXNjYWxsL3N5c2NhbGxfbGludXhfczM5MC5nbwppbmRleCBh NzQ0ZjZiLi5kNmQzZjZhIDEwMDY0NAotLS0gYS9saWJnby9nby9zeXNjYWxs L3N5c2NhbGxfbGludXhfczM5MC5nbworKysgYi9saWJnby9nby9zeXNjYWxs L3N5c2NhbGxfbGludXhfczM5MC5nbwpAQCAtOCw5ICs4LDkgQEAgcGFja2Fn ZSBzeXNjYWxsCiAKIGltcG9ydCAidW5zYWZlIgogCi1mdW5jIChyICpQdHJh Y2VSZWdzKSBQQygpIHVpbnQ2NCB7IHJldHVybiB1aW50NjQoci5Qc3cuQWRk cikgfQorZnVuYyAociAqUHRyYWNlUmVncykgUEMoKSB1aW50NjQgeyByZXR1 cm4gdWludDY0KHIuUHN3LmFkZHIpIH0KIAotZnVuYyAociAqUHRyYWNlUmVn cykgU2V0UEMocGMgdWludDY0KSB7IHIuUHN3LkFkZHIgPSB1aW50MzIocGMp IH0KK2Z1bmMgKHIgKlB0cmFjZVJlZ3MpIFNldFBDKHBjIHVpbnQ2NCkgeyBy LlBzdy5hZGRyID0gdWludDMyKHBjKSB9CiAKIGZ1bmMgUHRyYWNlR2V0UmVn cyhwaWQgaW50LCByZWdzb3V0ICpQdHJhY2VSZWdzKSAoZXJyIGVycm9yKSB7 CiAJcmV0dXJuIHB0cmFjZShQVFJBQ0VfR0VUUkVHUywgcGlkLCAwLCB1aW50 cHRyKHVuc2FmZS5Qb2ludGVyKHJlZ3NvdXQpKSkKZGlmZiAtLWdpdCBhL2xp YmdvL2dvL3N5c2NhbGwvc3lzY2FsbF9saW51eF9zMzkweC5nbyBiL2xpYmdv L2dvL3N5c2NhbGwvc3lzY2FsbF9saW51eF9zMzkweC5nbwppbmRleCA0NGQ1 Njc5Li5mMzcwMWRjIDEwMDY0NAotLS0gYS9saWJnby9nby9zeXNjYWxsL3N5 c2NhbGxfbGludXhfczM5MHguZ28KKysrIGIvbGliZ28vZ28vc3lzY2FsbC9z eXNjYWxsX2xpbnV4X3MzOTB4LmdvCkBAIC04LDkgKzgsOSBAQCBwYWNrYWdl IHN5c2NhbGwKIAogaW1wb3J0ICJ1bnNhZmUiCiAKLWZ1bmMgKHIgKlB0cmFj ZVJlZ3MpIFBDKCkgdWludDY0IHsgcmV0dXJuIHIuUHN3LkFkZHIgfQorZnVu YyAociAqUHRyYWNlUmVncykgUEMoKSB1aW50NjQgeyByZXR1cm4gci5Qc3cu YWRkciB9CiAKLWZ1bmMgKHIgKlB0cmFjZVJlZ3MpIFNldFBDKHBjIHVpbnQ2 NCkgeyByLlBzdy5BZGRyID0gcGMgfQorZnVuYyAociAqUHRyYWNlUmVncykg U2V0UEMocGMgdWludDY0KSB7IHIuUHN3LmFkZHIgPSBwYyB9CiAKIGZ1bmMg UHRyYWNlR2V0UmVncyhwaWQgaW50LCByZWdzb3V0ICpQdHJhY2VSZWdzKSAo ZXJyIGVycm9yKSB7CiAJcmV0dXJuIHB0cmFjZShQVFJBQ0VfR0VUUkVHUywg cGlkLCAwLCB1aW50cHRyKHVuc2FmZS5Qb2ludGVyKHJlZ3NvdXQpKSkKZGlm ZiAtLWdpdCBhL2xpYmdvL21rc3lzaW5mby5zaCBiL2xpYmdvL21rc3lzaW5m by5zaAppbmRleCA4ZmQ4ZWFkLi5mZTBiYjU0IDEwMDc1NQotLS0gYS9saWJn by9ta3N5c2luZm8uc2gKKysrIGIvbGliZ28vbWtzeXNpbmZvLnNoCkBAIC0z MTAsMTcgKzMxMCw4IEBAIHVwY2FzZV9maWVsZHMgKCkgewogIyBfdXNlcl9y ZWdzX3N0cnVjdC4KIHJlZ3M9YGdyZXAgJ150eXBlIF91c2VyX3JlZ3Nfc3Ry dWN0IHN0cnVjdCcgZ2VuLXN5c2luZm8uZ28gfHwgdHJ1ZWAKIGlmIHRlc3Qg IiRyZWdzIiA9ICIiOyB0aGVuCi0gICMgczM5MAotICByZWdzPWBncmVwICde dHlwZSBfX3VzZXJfcmVnc19zdHJ1Y3Qgc3RydWN0JyBnZW4tc3lzaW5mby5n byB8fCB0cnVlYAotICBpZiB0ZXN0ICIkcmVncyIgIT0gIiI7IHRoZW4KLSAg ICAjIFN1YnN0cnVjdHVyZXMgb2YgX191c2VyX3JlZ3Nfc3RydWN0IG9uIHMz OTAKLSAgICB1cGNhc2VfZmllbGRzICJfX3VzZXJfcHN3X3N0cnVjdCIgIlB0 cmFjZVBzdyIgPj4gJHtPVVR9IHx8IHRydWUKLSAgICB1cGNhc2VfZmllbGRz ICJfX3VzZXJfZnByZWdzX3N0cnVjdCIgIlB0cmFjZUZwcmVncyIgPj4gJHtP VVR9IHx8IHRydWUKLSAgICB1cGNhc2VfZmllbGRzICJfX3VzZXJfcGVyX3N0 cnVjdCIgIlB0cmFjZVBlciIgPj4gJHtPVVR9IHx8IHRydWUKLSAgZWxzZQot ICAgICMgbWlwcyoKLSAgICByZWdzPWBncmVwICdedHlwZSBfcHRfcmVncyBz dHJ1Y3QnIGdlbi1zeXNpbmZvLmdvIHx8IHRydWVgCi0gIGZpCisgICMgbWlw cyoKKyAgcmVncz1gZ3JlcCAnXnR5cGUgX3B0X3JlZ3Mgc3RydWN0JyBnZW4t c3lzaW5mby5nbyB8fCB0cnVlYAogZmkKIGlmIHRlc3QgIiRyZWdzIiAhPSAi IjsgdGhlbgogICByZWdzPWBlY2hvICRyZWdzIHwgc2VkIC1lICdzL3R5cGUg X3B0X3JlZ3Mgc3RydWN0Ly8nYAo= --------------9C00AC3CB27B93ED464C14D9--