From patchwork Thu May 20 10:49:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamar Christina X-Patchwork-Id: 1481507 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; 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=SyONTBnv; 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 4Fm61n0Sbnz9sWF for ; Thu, 20 May 2021 20:49:31 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F1C5A39518AE; Thu, 20 May 2021 10:49:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1C5A39518AE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1621507769; bh=jxXKJfAUn7Xrq82p7nG8KS0elni0q5kEsAJKoT8d3ZA=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=SyONTBnvpxXatomVa6ikNuOWCspjarRmUnvUfHWejzUbUzW31owBiaAPprhKuy2Ms qBhQdnZPfFPKH2/CQIJM1eTgNvnFY9wYfm4NJDSBAgaD0aP/4/2w93bWrGQMzXblVG vvO0tM/POZdoVgaJCek1QZkNkVojuL0XVGAFaPOE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10061.outbound.protection.outlook.com [40.107.1.61]) by sourceware.org (Postfix) with ESMTPS id 874C23951438 for ; Thu, 20 May 2021 10:49:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 874C23951438 Received: from AM6PR0202CA0055.eurprd02.prod.outlook.com (2603:10a6:20b:3a::32) by DBBPR08MB4361.eurprd08.prod.outlook.com (2603:10a6:10:c8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Thu, 20 May 2021 10:49:20 +0000 Received: from AM5EUR03FT052.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:3a:cafe::7a) by AM6PR0202CA0055.outlook.office365.com (2603:10a6:20b:3a::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Thu, 20 May 2021 10:49:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; gcc.gnu.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;gcc.gnu.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 AM5EUR03FT052.mail.protection.outlook.com (10.152.17.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Thu, 20 May 2021 10:49:20 +0000 Received: ("Tessian outbound 3c287b285c95:v92"); Thu, 20 May 2021 10:49:19 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 95ee51e22b0c8b8e X-CR-MTA-TID: 64aa7808 Received: from 9e73f4805a59.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 3D77082F-00C0-4A3A-91DA-C510616A98B6.1; Thu, 20 May 2021 10:49:13 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 9e73f4805a59.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 20 May 2021 10:49:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=odGgGV1hUOdLQ4p3EMuigMM+wtZirgOPQBaAbKZRg5O2RtAFRBIzvku8GEdEzScxKLLe3A/drjkfW7owjgsWGLqFppkn9GdFJdNgrt+wALIWMoyhL03mOp2eCPoF2UBobsvyYkZQ5gpRm5Iyv+KBWHHjzSLeoFSQ2gED5/ecgGdh3KwZ//vjDL/euLLXOQmkcOR5OJ5h7FK5evGe+X70dcn6Pa0jfvtPEJpJ8bIfzj0+R/fucYg/CM+UoiGXg6fTe5fXBrlJJ+G+O9KeHYwSp480LDD8/6aownc9/nl8vp0wyagswEBQ4J17HCsyUiIWdATHQsQuzJGDIBS6C6HAiQ== 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=jxXKJfAUn7Xrq82p7nG8KS0elni0q5kEsAJKoT8d3ZA=; b=nQmYkxyVUISF4kkpw3FIJ6E2BsbUcqfus/BiPwkt0Xvfn/aJuqodogwULb0KohY459J1UpG3vNFnXry7nSQXp2QqsdE0x2uRbup19ubovHKCKuTBTd3qu1RoJ6Kabp/0A3duYVx54UDIFMkze0voOT3pLs9OdYYpdcr77JNkZqfk7+b7rG/vbdIhZPxymk6F7p559E/KvL2xCQaILgS+UnQubVgzNqx6TPXpepw3QpqwXwDLWvAoPTM/vBy2jUxYvYV3L0/5GGr2ou2pewjAexWOeLTA0fXRJymRc/dLn/OoTlZMvUWgN8yDrctpThtCZvWS+XjKEpFh6tdMtTzyRg== 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: gcc.gnu.org; dkim=none (message not signed) header.d=none;gcc.gnu.org; dmarc=none action=none header.from=arm.com; Received: from VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) by VI1PR08MB5455.eurprd08.prod.outlook.com (2603:10a6:803:135::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23; Thu, 20 May 2021 10:49:12 +0000 Received: from VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::f557:1fb2:62cc:5243]) by VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::f557:1fb2:62cc:5243%9]) with mapi id 15.20.4129.034; Thu, 20 May 2021 10:49:12 +0000 Date: Thu, 20 May 2021 11:49:03 +0100 To: gcc-patches@gcc.gnu.org Subject: [PATCH][libsanitizer]: Guard cyclades inclusion in sanitizer Message-ID: Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-Originating-IP: [217.140.106.51] X-ClientProxiedBy: SN7P220CA0029.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::34) To VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from arm.com (217.140.106.51) by SN7P220CA0029.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Thu, 20 May 2021 10:49:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd3a44b5-25c2-4541-d574-08d91b7cec31 X-MS-TrafficTypeDiagnostic: VI1PR08MB5455:|DBBPR08MB4361: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:4502;OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: rZMg91Karol1YOkcn/FM3JwNAT1nnqRK210ImTdKRVoC/12dtepR+G1tfWIWYfaFyh0pVcXT7T0gotXaCrq3XkBzQWLULzkj9sR+3b8BVLFNN/sbwifpr9284bLVQodG+XOJ0LXPBT82QcpQHckY4JgGKsMIbMU4MOjMqdKVXc/J1csWfd0IDOfTW8Ie1eLfcQ38evGCE+tpzDcb+lQlSIYKCUN2VMGEr6Vs9cflhjofXWfkwtoVYtRs2cTbcKUG22u8p/4m6oWqx+n7twzWDRSn6Yww7oq3lQ/rlleyEN/xlQfE8P/IXkFgV2jjVbqNSEwjMDmCmYj5HgNeq7s/ssqURQjGbfvrQd++0UMfUInnINbEa1iZC/0tSZWudwx57AxVbMsFenV7BhD8JLb7izOtAF1kgIU3jgdpCYmR/JfQDrX4Q1mgln94pgUru5a+ygm6UahzaX1KsVLdjDI5TG/N4lQkOcuDrdHA8NEPzMlEvmNVcnhk+ZYf4Vg8s/heet3qh/vxmTF/Xv5ukiF00ma4lBHjuPHr/DTduadG0z2kknJ4T7Mhr1bGt0B6ak3KpTtVPXzA3puSElqTMPVMy6LKuMoiy9Q6JpYdG8ju1VF1CH3ZfAsotLN8EsVDxztm0LI9BIZKLIkG36g8CJS4yWDnehLGq/8IsaOxdxGSXldrnL01P/Gu4XgCOoWsgo10Ci7Onjq5wkkUoeqvq/JHXl9BNjkY9lGE6Ovpg18tkZ97lc1MShHCdqADprf0oQbUun37aGsC4ikvY+9p0A8AOT6rV8pudPirWGi4vx+zk5xlaO1OaYQdHuEVixJRvY5d X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR08MB5325.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(136003)(346002)(39850400004)(366004)(4326008)(55016002)(66476007)(478600001)(966005)(5660300002)(66616009)(235185007)(66946007)(186003)(44832011)(66556008)(38350700002)(16526019)(2906002)(956004)(2616005)(6666004)(38100700002)(86362001)(8886007)(83380400001)(44144004)(8676002)(52116002)(6916009)(36756003)(8936002)(26005)(7696005)(33964004)(316002)(4216001)(2700100001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?AiLXOtlRSVBXg1QOF4MSHQNI2/J3Jp?= =?utf-8?q?MDju7OjF16Kt5wLtFCrnCUTiVXaKI97mEqE5jua73YHlNx1UHLISdl4k988Ck7h8o?= =?utf-8?q?iZ3fzIlsbm4M8Dd1QY1DHhVeTDOKlHGyaHivlGvh7SuVL3MY0mcOjk8II8jWwGpOf?= =?utf-8?q?I2glNEC93pAy5BTw7MPlDjMhpXJJ700JEf0EzhtUSZzPSEbKlK4jVcGYECJqGH688?= =?utf-8?q?VqVXHxEwdSOzHr63/F+EsqH/Hi3M+PplGHgxmD8iPsi5Z9BU0NqGmrnywMIZqpEVa?= =?utf-8?q?bzZ17aAp42+tfDl8oaw9clvEQ1QjyZ1mScsBEl5dEKRQhVqUlw9r8rxZSH6bEkgMH?= =?utf-8?q?EkoYaST0f0g7BnmDe5XAyk15kYIT0N5KDAF8LiS7ePk4S1KMDDKtaOEvMZc908kvU?= =?utf-8?q?QhgPGDuxQoeVN5HbWTatmGWAm38cvZY5r1z7boCYvj5s0LiN5jC/gZ92N/U1GZJ8/?= =?utf-8?q?+jWH9EePGxD2DW6FmNKnFcTtmV7dbwHJwoWhNQH/gqx43eCIiASWjP8yF2hiK8ii0?= =?utf-8?q?U2SC6RQxJrym7njwQUw3c8M8rCS6fvBp41UC/Vy2Ii+fgqdp00L5jpf5knOz6GiQu?= =?utf-8?q?MoswaUmTBnJmsCUN1tZNog855gncL8GOOj4aytm4znLF+6PpgP5KuL4hqJ8xfia6f?= =?utf-8?q?RIYDFdA/TOyPYOsAm4ExRtejfmJ+kykFSnlKBG8shEq2Ht92gsVhgzV0J6UvSeQpy?= =?utf-8?q?TUM8Umq3b0BxivXg0Lx7FHSZ4t4tN25nzA8SLnClYJlUAggCf48DdfJ6CCZ3ehV+F?= =?utf-8?q?BNLkOfzy/yCYfRX7HmiZtPkiyzJai9qSol6y6M3BUueID4LOyN72ckziEtTa1SVVy?= =?utf-8?q?EtCbB6gECM6fPDLApcCuZIr1YRVaOVpkB2I3Kp8NVysC271slgaRCYj/NXJC4sbLX?= =?utf-8?q?qd4hPm675VJDAVeHlKJDLVq/skgCZm4QojTNsj7t3hIpTangc19Gz+7r3BdtTeLBa?= =?utf-8?q?lseFHyUJHj5TzTGMmXUuDhnMs7F8F9P6C1aaFtnlL/6PJcTXh1B+5UWD5iGRibLb5?= =?utf-8?q?B9uJJUeX9wBLpGGyH07Xh5rZG3Nfh+XcX4luOc/46kvhOV/9jlGWkZWLHVSNUHd1t?= =?utf-8?q?NUHnzHTxWAcnR8o+XV5dccwe3oODUaXal0MVhDSdvu+GHkKcek2IvnK8Ev1ju0FUB?= =?utf-8?q?UsvCYOjAXeOQeKd1xFRyTfGqZeh0fyLV80WiIOLE0jQ8NXeqA4ov+bS68ZEasDLrG?= =?utf-8?q?SLp9Ri5goUwyPHNV6PhUDNqxm5BVJfj7LNSQZISG+QrRU2h/2zTrpwpcmugbzQ/aO?= =?utf-8?q?vGRGKCv+Zpr45k?= X-MS-Exchange-Transport-Forked: True X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5455 Original-Authentication-Results: gcc.gnu.org; dkim=none (message not signed) header.d=none;gcc.gnu.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT052.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: d1394336-4dd1-47e8-6fd3-08d91b7ce724 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RnJRWSXNFIRH6Zegr5rW9cINPRt64IWCyExYCeGBKDWAnFueZS9W1OFKWV7LkeWXoGVPxryB0z/cL4vSxBYnOFdQVesCEomztQ0bPIVGwMX87SsNplmXuehrg5pT0Wd6edP9NdbprtSjkAkooRox//ZpsOs0Bbp5YOAyZXFExdE3kBuqRjOR5TnC1HMq2wH+ioYLcMr6OZeuhEESNNxDcZgEkoahvObCcqQzWy5oKr9F0kDndlUwz4BO5bZEtgX52j1wbmq8ZZau65F6BlyCJPkwv3tX5cm9KwmUqDSOIWopElERTfrF4qUqrxFE53ZvktjzmrP175WxK3weIbqDXfearNxaAXjr7F0VDJkrYgDfOnd5M+qsha4TSqLrS/C1CvIoOMo7PEu8OY8xzqJywTHLaobZingP0DAhdq3+XgDyZghH0SbOeckYTjQocGZT/FsUV0tqZvUW3wq4i5/57d6EqVT24loinFBz29Rd3C8paTjBmZZTiBHpyCpl/X2ikpdGsgt5DoEZuBlnUwiMO4+YbXx8bd9T/Ln9CDZphv3j+/WuXTSsNou+TzwSclYQP6znMZggP4oWkquQ/n6sV25ybWDBFPsMKN8bFh4W/VJEu5Httb86kLGu40UOxVy3QhN38uZfKn6ijHkOUSbEmTu/Q/nDb9VOu+DozRIhXQ78ETquZcLGKiq4oIKukS3HcEVVHMLe5AayLqrrM40z2/sWOHBvJIUOzEIyo/M5+4Izgoz3BdgGPj5CHi58haTJn3cpET5SzOqSQ5vopZJ6fNsT8A/mah25uOu296vIxaBOOFvIrYhU6khDM5MIXcDi 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)(346002)(376002)(136003)(39850400004)(396003)(36840700001)(46966006)(8936002)(2906002)(81166007)(6666004)(47076005)(356005)(83380400001)(6916009)(8886007)(44832011)(86362001)(4326008)(26005)(966005)(36756003)(55016002)(82740400003)(66616009)(2616005)(478600001)(33964004)(5660300002)(7696005)(44144004)(8676002)(16526019)(82310400003)(235185007)(186003)(316002)(70206006)(36860700001)(107886003)(956004)(70586007)(336012)(4216001)(2700100001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2021 10:49:20.1419 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bd3a44b5-25c2-4541-d574-08d91b7cec31 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: AM5EUR03FT052.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4361 X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_LOTSOFHASH, KAM_SHORT, 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: 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: Tamar Christina via Gcc-patches From: Tamar Christina Reply-To: Tamar Christina Cc: jakub@redhat.com, kcc@google.com, dodji@redhat.com, nd@arm.com Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi All, libsanitizer: Guard cyclades inclusion in sanitizer The Linux kernel has removed the interface to cyclades from the latest kernel headers[1] due to them being orphaned for the past 13 years. libsanitizer uses this header when compiling against glibc, but glibcs itself doesn't seem to have any references to cyclades. Further more it seems that the driver is broken in the kernel and the firmware doesn't seem to be available anymore. As such since this is breaking the build of libsanitizer (and so the GCC bootstrap[2]) I propose to remove this. [1] https://lkml.org/lkml/2021/3/2/153 [2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100379 (cherry picked from commit f7c5351552387bd43f6ca3631016d7f0dfe0f135) Bootstrapped Regtested on aarch64-none-linux-gnu and no issues. Ok for master? Thanks, Tamar libsanitizer/ChangeLog: PR sanitizer/100379 * sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Remove cyclades. * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise. * sanitizer_common/sanitizer_platform_limits_posix.h: Likewise. --- inline copy of patch -- diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc index 7f181258eab52b11688d6857ddfe09acc98ba986..b7da659875574ed3ca457780799d5b4c556d2f68 100644 diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc index 7f181258eab52b11688d6857ddfe09acc98ba986..b7da659875574ed3ca457780799d5b4c556d2f68 100644 --- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc @@ -370,15 +370,6 @@ static void ioctl_table_fill() { #if SANITIZER_GLIBC // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE - _(CYGETDEFTHRESH, WRITE, sizeof(int)); - _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); - _(CYGETMON, WRITE, struct_cyclades_monitor_sz); - _(CYGETTHRESH, WRITE, sizeof(int)); - _(CYGETTIMEOUT, WRITE, sizeof(int)); - _(CYSETDEFTHRESH, NONE, 0); - _(CYSETDEFTIMEOUT, NONE, 0); - _(CYSETTHRESH, NONE, 0); - _(CYSETTIMEOUT, NONE, 0); _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h index ad358eef8b77e0f0098af41f30ce3e7084ee4552..cba41ba54943d80da7d557ce52e1a3ee36e3946a 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h @@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz; #if SANITIZER_LINUX && !SANITIZER_ANDROID extern unsigned struct_ax25_parms_struct_sz; -extern unsigned struct_cyclades_monitor_sz; extern unsigned struct_input_keymap_entry_sz; extern unsigned struct_ipx_config_data_sz; extern unsigned struct_kbdiacrs_sz; @@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; #endif // SANITIZER_LINUX #if SANITIZER_LINUX && !SANITIZER_ANDROID -extern unsigned IOCTL_CYGETDEFTHRESH; -extern unsigned IOCTL_CYGETDEFTIMEOUT; -extern unsigned IOCTL_CYGETMON; -extern unsigned IOCTL_CYGETTHRESH; -extern unsigned IOCTL_CYGETTIMEOUT; -extern unsigned IOCTL_CYSETDEFTHRESH; -extern unsigned IOCTL_CYSETDEFTIMEOUT; -extern unsigned IOCTL_CYSETTHRESH; -extern unsigned IOCTL_CYSETTIMEOUT; extern unsigned IOCTL_EQL_EMANCIPATE; extern unsigned IOCTL_EQL_ENSLAVE; extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp index 35a690cba5c834a6952ebc0d633195155b151447..6e5c330b98eff32e3fd49b4ff95f72a50230c538 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp @@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t; # include #endif #include -#include #include #include #include @@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); #if SANITIZER_GLIBC unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); - unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); #if EV_VERSION > (0x010000) unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); #else @@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); #endif // SANITIZER_LINUX #if SANITIZER_LINUX && !SANITIZER_ANDROID - unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; - unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; - unsigned IOCTL_CYGETMON = CYGETMON; - unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; - unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; - unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; - unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; - unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; - unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;