From patchwork Mon Feb 15 16:29:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 42063 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F06633851C35; Mon, 15 Feb 2021 16:30:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F06633851C35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1613406611; bh=jDT/Ccx+UstFXE3AdFEvgwxNd8MV1nLF1CW/V21S04w=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=L8vemObKttHfeSeD3Ye63/mbyWKDj/QpamuxkoUch1wF7GB3eEbcMzeCwDW8xcWWF 4pr8VLStdXw3YK/eW68NAK4PJ4LI3Y2GSoazJ8mSm/N1i4PzSbbg0wtipUoRkk+II0 YJt95VA5hUjPUv4hDmjQ1LdSvV1wxJscr07o/rQk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150072.outbound.protection.outlook.com [40.107.15.72]) by sourceware.org (Postfix) with ESMTPS id F32643851C35 for ; Mon, 15 Feb 2021 16:30:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F32643851C35 Received: from AS8PR04CA0024.eurprd04.prod.outlook.com (2603:10a6:20b:310::29) by DBBPR08MB6105.eurprd08.prod.outlook.com (2603:10a6:10:20d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.34; Mon, 15 Feb 2021 16:29:59 +0000 Received: from VE1EUR03FT021.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:310:cafe::74) by AS8PR04CA0024.outlook.office365.com (2603:10a6:20b:310::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.26 via Frontend Transport; Mon, 15 Feb 2021 16:29:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;sourceware.org; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT021.mail.protection.outlook.com (10.152.18.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Mon, 15 Feb 2021 16:29:58 +0000 Received: ("Tessian outbound 2db1bbc8a1d2:v71"); Mon, 15 Feb 2021 16:29:58 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ffe54f9cbe0e9c9e X-CR-MTA-TID: 64aa7808 Received: from 27a459fae127.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4475C19F-9F14-45E8-AA37-E47FCFE4525B.1; Mon, 15 Feb 2021 16:29:47 +0000 Received: from FRA01-PR2-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 27a459fae127.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 15 Feb 2021 16:29:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fw5Usc5mo8V8H8QTXKXrWft+czvnmffpdGE5c7qpaV46dtFpXeQnhZaQBNHW9bm2/TrYs/UqhMRCDDHoTYRKL4Ne3Ol+BunGQkYBewAfyjLC9WmmzpO+PgODpmz11C9joXMf1k1pxTNYq9XHMxaeSnHQ6BlGXI5tzD4HgkBLOsss2Yto5SHLu5QyXN9GpkuLf6DtOv3PiQm7ordRoB1abfke34C6Raw+dqdvlwngc529nOVtreh7U61pk8salhnQV+fKmbbxxCMu1Krezbc0Mx2NZY6o2VfAIIOKrxAnNdXlyDBnUt/A0JUuAuK4T9K9jfZCk+wUkw4Z49pryoMjTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jDT/Ccx+UstFXE3AdFEvgwxNd8MV1nLF1CW/V21S04w=; b=aRpypyWqJQZ8O1Ho6WyFQYiqE73MIcFxT1ncCGZcBRLkr/fU6VHh7SMQUsIMyiYsAcIoSgnNTsPyNAgui4NEljkaXZhL11GUGJkP78pu4YmngIAqhDr/RnEFadEdRIordR1GkCA8mbTtrfcB0I6Vced+AYHgK+Ekx0Puw1foLPxmTY4HanZCY/DWx6LzBgRN9SoC7ypxASGj5x+1wWq1ytzCTsNvniv5LKtKgg4yjWYIyUxY/KkBLTLlSCn1AtCoZ5E41JgTz/1WxkjTvHI+aAmz72TVP2c61KP4L9l06uRlPUPYZim6ip0g07WsSFqpNPosdCSO6y5Fsm6wRPXoQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=arm.com; Received: from PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) by PR2PR08MB4713.eurprd08.prod.outlook.com (2603:10a6:101:22::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.27; Mon, 15 Feb 2021 16:29:46 +0000 Received: from PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::60f0:3773:69b8:e336]) by PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::60f0:3773:69b8:e336%2]) with mapi id 15.20.3846.042; Mon, 15 Feb 2021 16:29:46 +0000 To: libc-alpha@sourceware.org Subject: [COMMITTED] aarch64: Fix sys/ptrace.h if linux headers are included Date: Mon, 15 Feb 2021 16:29:38 +0000 Message-Id: <20210215162938.17534-1-szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [217.140.106.49] X-ClientProxiedBy: LO2P265CA0433.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:e::13) To PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (217.140.106.49) by LO2P265CA0433.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.35 via Frontend Transport; Mon, 15 Feb 2021 16:29:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 86d4cb73-cfbe-4a54-805d-08d8d1ceefca X-MS-TrafficTypeDiagnostic: PR2PR08MB4713:|DBBPR08MB6105: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:1751;OLM:1751; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: +/Nozn7MVYxAWA0VOBucENIogtmrBkk5Smr+H9ZT0NPuebw5KcIg+xuyyIkUKE3v7FeP0lT6DtlWEFs2kLhQQJEHHVq46N7T2yy453v66oJF7K4bNLeK8hZhczcLBYJCvhpYQefrEFgZiYrqd28gCr/Z4pSTg5P8GPvrOjitmVfKaP3Dr8yoAY8n20pPcDtXJI8qjgVJaAWYyITXxIxx5zupGUi0qeNGrmGVufzTn2dbDeJiP4P5WHligdCIWePx+Mxui8aZzOQBMwSEmwgNj1P96ksmqmj2se1EN+kFn/mRi9J9G0S323zfzH05Tk37TIXj5MamPjLJwLXIAP+itIVL0X2ISpKHN4oWCXSq80Ky/ml/6ehIGS5u9lpH2GWW9oTAmwVvVf1+9rPZ4IHI/qj1azEPwXx5v88KKIZWWIUIHuKLgGBnU9mmMfHjGVWUd5epXBlR0FbHTVr5/OWvGXQZqLyJrEmrcFJGAtIUAp7lDDXfkl9ZK2cXoGIf7wIO+rRiZxcoQlGjzXGcaHWplrtWaU/5ViQoRqXlnPRy9SaIqgL/afRDO6JH8QR3Cx7KC/mUfuTDDsQZVavYSKw43w== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR08MB6320.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(366004)(136003)(396003)(376002)(346002)(86362001)(66556008)(83380400001)(8676002)(36756003)(316002)(6506007)(6512007)(6486002)(478600001)(6916009)(1076003)(186003)(16526019)(52116002)(2906002)(5660300002)(66946007)(66476007)(8936002)(44832011)(956004)(26005)(2616005)(69590400012)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 84rSS98YeEQGaGVitXz53+QhcyJ7mVghFr0Ng1fO/fIxqKTaoGm+Kvgih8fGXFdPOkIO/gxzRkX09BsUomFKWFLA0oQar7NxgWvXODd8wfiVSh1fDnCFDHl1NqQFvOS5hphgrAZ8/BNOhg7qTWP3HYFhKixrtAKiOfSilRixVz7aXqyV1PfJNijoRAKdng0+isBaApWcQl3/tcauuyuCt29WzxlG3x9+FJ7TMNRzcexYxjhcigPbyoPVMV/E6hFq7+g2Zuju2OU25uBs8lGfnKlyJHVYjGlzLgCERzWpswqf3H4OZCNS5sSb6PCWpfpVgbnlHOmlTax7xNmxLdKNZqEsbY+GSeokKzLZ6aiQsEL5DjDOykXHD0G4AD/BLJP272IrfP9DZnm3xfROo27ll9atZ0Dv+LwQOnxNNELip7rA+s8xkBFhRGgSL9mvBua9aFhajZGHvCMwM6ILA70e/4zlyoB8coFOgME+BRXawbnnYYqJ8GX2z+ppCF8AwKDIRyaVaKSnw9Tl2Dhc/hFzakFSkCrPg8CbKrSGKCwCo+b2CWQz88VRs44rmp1SumRQnvYZE5ZiAqDk/To6H2DjZQ2Q5fJXnoxuqayvdA2nB1AGxFsf3ow/DvliiK9CIouN7+g0e4iROtRv27TPLUANQ49qmsrDKw505bKeNmd8ZSjgxCG3y9bLuORtBx8noB2FFjoLz/JsBEmKO/OFljK3uCIEmwl0lgwwLAMWPEZxEBESFsEqVNOUMJkk3pZknN+IhEwFxoekFOE9aqw22SuOk77Uy90owS3NtTrEHnT/aUY84gThkwKae96ozbHUJyYTYaGhJows1mXEowKHl/s7gYP2dzz4F28C+hVzFBYCFmCxQ7PaPJZDphiHy+1dTM8bcpqKNK/VAhn0K/6SkPF4gzcJTm+ah0BUQ2iLhAceLAYfaN5icgoUl9TDeANgFvNnWKRo1yf3z6AuksqygTaGTv4l5EgUMYUZAsbXqKJKPSx/YgTRW7AARyqbp4RTlbQZxmCx+EJr0/Zp3dWlCF1g3MhfI9bsyszI7YTpBj4V8lwVzRs7Ci1ArAbUbIPwhHTqOqqZ1HmeE8Te9Ng+YGvxyj61veyQnPBri/nDyhTiBhRPNG0DMrjMsk7hyPkAc6zwXR2GLKdLn4YRvXFdhHDHUzZqVYwiIB6ZKRLMv4D1nqPH4+JJUZ1TumgO+WW12PBShZb1Oc/ivVYkLeJzPtwpaFPUCR9qBNits/5ywUhn7WwhgBgZAtFnx7ajyLJo5IAu0dexh1U2+Cp+3EbXaqR+5MT48y3ZUlj6i2a9J8AkD6okvjJYLctzh635uYmFMV1/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR08MB4713 Original-Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT021.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: c04496ff-9b58-4958-9fcb-08d8d1cee7cc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ky8/GPwg//iThMhkTlW2FKOEVNuAAmDLWNOYP+kwCaUFBMumyexNfYDJ9vE83CoAZZGz9H7p0IZtWKIsNEyLjGTKJlfxdmql3QK4ABNeog/Yp8TZMj09Xopj1+I3HXBAe3kzV3ByfYczyXkuxbNX7+q2lv9B9D8XAnjh41kS3pirH5B5Ir2mGaDmBvkC3cyKBFmoKufvw+gSJCUNLYYBII4oZofjZrrSkzYUABEgbyr+Ot9RcVvSLvGBWIarKVCU83RZ2q1szpa2v7qMGxI38QBM2QihMSl9nfeHD/Drv2VLuQql7MDUAQXWAwPdW624Afej7WSh5qkXF3NDR7kg/5iMpTbUIoD5WPbz6RTPToHqFJ0exPWV/jVACpdVb1QRmsSKeDrYRHlHXLRTVk8R6SsqDSWcmk/FYcOk5mlV3zTWvgZAZ93GCsalBReT//vw1sfB+5mUgo9DgeXiFrJHHOT3gj9x7tCo1BFcAVWjG95aQOcI9B2FX8JXzDNjpbV7KgIU46OVoj6JjtFYESV25qGqqmQATPlj9AuFcezCa7wmRzjG68DzXuDb+4T3v5mQIxZ/ROPgkdhHwT4mTTzmIDxuZoCaCtAEkgUFA8c3RULFmhgTNl9y/OfxAgCzW4W7Ftzr/yPozv+TcTlDnVm1LPxM21dEbZFGws0/GDHxO92Wv9bt61kNkfTjNqSZA0jx X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(136003)(39860400002)(376002)(396003)(346002)(46966006)(36840700001)(36860700001)(44832011)(86362001)(6512007)(16526019)(1076003)(82310400003)(186003)(6506007)(47076005)(2616005)(8936002)(8676002)(36756003)(6486002)(478600001)(6666004)(69590400012)(2906002)(70206006)(70586007)(6916009)(5660300002)(82740400003)(81166007)(356005)(83380400001)(26005)(336012)(316002)(956004); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2021 16:29:58.8139 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86d4cb73-cfbe-4a54-805d-08d8d1ceefca X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT021.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6105 X-Spam-Status: No, score=-14.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Szabolcs Nagy via Libc-alpha From: Szabolcs Nagy Reply-To: Szabolcs Nagy Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" If the linux asm/ptrace.h is included before sys/ptrace.h that breaks the newly added declarations there, so undef the names that may be defined as macros in the linux header. --- sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h index de26da0023..af8193cbe7 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h @@ -25,6 +25,40 @@ __BEGIN_DECLS +/* Avoid collision if the linux ptrace header is already included. */ +#undef PTRACE_TRACEME +#undef PTRACE_PEEKTEXT +#undef PTRACE_PEEKDATA +#undef PTRACE_PEEKUSER +#undef PTRACE_POKETEXT +#undef PTRACE_POKEDATA +#undef PTRACE_POKEUSER +#undef PTRACE_CONT +#undef PTRACE_KILL +#undef PTRACE_SINGLESTEP +#undef PTRACE_ATTACH +#undef PTRACE_DETACH +#undef PTRACE_SYSCALL +#undef PTRACE_SYSEMU +#undef PTRACE_SYSEMU_SINGLESTEP +#undef PTRACE_PEEKMTETAGS +#undef PTRACE_POKEMTETAGS +#undef PTRACE_SETOPTIONS +#undef PTRACE_GETEVENTMSG +#undef PTRACE_GETSIGINFO +#undef PTRACE_SETSIGINFO +#undef PTRACE_GETREGSET +#undef PTRACE_SETREGSET +#undef PTRACE_SEIZE +#undef PTRACE_INTERRUPT +#undef PTRACE_LISTEN +#undef PTRACE_PEEKSIGINFO +#undef PTRACE_GETSIGMASK +#undef PTRACE_SETSIGMASK +#undef PTRACE_SECCOMP_GET_FILTER +#undef PTRACE_SECCOMP_GET_METADATA +#undef PTRACE_GET_SYSCALL_INFO + /* Type of the REQUEST argument to `ptrace.' */ enum __ptrace_request {