From patchwork Thu May 30 21:32:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 1941835 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vqzzk4HSbz20QB for ; Fri, 31 May 2024 07:34:42 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E1383384DD00 for ; Thu, 30 May 2024 21:34:40 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id EF2D33850200 for ; Thu, 30 May 2024 21:33:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EF2D33850200 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EF2D33850200 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1717104796; cv=pass; b=GkBUgksPG221PFxUkGwEmr3rCSxqg/8S34zA8mWCdPlKuGEeCZghCs9hRIWFJ9n/eqpRdsab/CXjPC38TT47Vazgpa6xBMr+UxgZtfbMq0K1IYmn+m5dIWGqEqxw+4sp+yc/t7IjwjqfB80S4or7eoZ6h9f//TB19JaS7N3jdGk= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1717104796; c=relaxed/simple; bh=z/GXbj3Fb6IlG0ujMSUcDRci7crEVyZOFBiC0vPL+6U=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=Tzp0MwRG0y8rvSxq2PdSRuLphgk56pcdzBEv41LrkJvzkYafwHZxmPg2+M2wB/6bHLhIdTS6rK/13ZDFRxEn6vyJRQfMfaqZrfyE8tbU0CX3ZC7dYJ9OebrY7udf04eCdi7hmGPIGnI6m6mIFnwEfum2WLaOo/aYOnw2VTNE+Ek= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44UFSO0j003262 for ; Thu, 30 May 2024 21:33:10 GMT DKIM-Signature: =?UTF-8?Q?v=3D1; _a=3Drsa-sha256; _c=3Drelaxed/relaxed; _d=3Doracle.com; _h?= =?utf-8?q?=3Dcc=3Acontent-transfer-encoding=3Acontent?= =?utf-8?q?-type=3Adate=3Afrom=3Ain-reply-to=3Amessage-id=3Amime-version=3Ar?= =?utf-8?q?eferences=3Asubject=3Ato=3B_s=3Dcorp-2023-11-20=3B_bh=3DPMGU1Nfzz?= =?utf-8?q?Zis53l6oeD8Ayocz4EDxov26HCgRFIth4o=3D=3B_b=3DOqUlswpfObo4/U0+4L+U?= =?utf-8?q?pmDWONzdwWk42M4kfEgZfJP/gsZ+2qFFq4alfJ0K+GOUYtfp_AdBxZAHNsvJy0wkp?= =?utf-8?q?WoGsC3N2nctATPxsZhW92N1vwSeblPSVjrUbSmy5NFlpOH8xDFL3_Kds3rJEbHn1b?= =?utf-8?q?IjNmeZKN6jo+gsRjHDs/hTTvNeoC/B9M5Gxdm7dLNJihss6EUGkKMEr8_4SlwUzjA?= =?utf-8?q?ndjGmkseinFhPSNTlIAhK/Us0AOXpOV9m1zMDPgwT4J0Kq/lkhXZ8oTdSZ1T_C+8C?= =?utf-8?q?LteXOuW4LgKv9yXaN6YjOQixYsuOAeBQcXgCFJHy1+fZ8zbYC2IE1kxo6EGoUbWi_?= =?utf-8?q?KQ=3D=3D_?= Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yb8hua1rx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 30 May 2024 21:33:09 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44UJsWc1016224 for ; Thu, 30 May 2024 21:33:09 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3yc50t3sys-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 30 May 2024 21:33:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G5GcQV2aI5gCdGYNUtgKOBqgRv4BV9cZD+KRRwFwHtmfkonBByLOecI6HMJrORI0UiSaSzSqgxC1zZyrnyf86tdk6IkGuAFWsFKW2xWaEv7uJh5ClVMM3AsQ9xhXk2qrRXIluwxu/whdBuOZe91p1cBctQuxxBoNGn0H495JeTIjFCovk6i9R+oEmvfT9T0Wz2k+iqMQabBBTDw5A1Bnkc2BTZztANuuLh55T/M3tc5dTUquGI4NsUGlSFZsrffqwV50c98rvJo2oDXVTvhhVckUXyFqMY4FFOKSFqMBbZcQO5kJLuxauSwQAjWaA4/cTMI+0bKT3FQd5pAxEdfEAA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PMGU1NfzzZis53l6oeD8Ayocz4EDxov26HCgRFIth4o=; b=FfGUacKBhs9+yDceH+7VLgtI0Ob2vYyFsMNSHoh+oNNhzER3sW+zybLkW3ouQbhrhEEgg74nqMsuFMvXWksOYKDL/vzongFfYLB63GY2zlaGjMRSnwZFIrnL9Rl7MGN8nhrrjm0xiae6x+lYfK9fpx7z+8U+SQkYjEERVtdXixbd5gK5CY+GkDC0eiuOyfBlP6T8l+Qsx9gOtzY0xv+vcaF7cjUjtoJJ9aHlPBYl5I9nkPn1jrh8wiR0oBFsEKExLMFUAq/1ZoQUl3VD51k8ihMms/jB5kAb+1wU4/BNUCMVz8hQc4LHF7cxM+2PGX0SDyCqp6eX9pqnOcxWja3l1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PMGU1NfzzZis53l6oeD8Ayocz4EDxov26HCgRFIth4o=; b=O0KZfuW1CUS7eGD0ZpaZFneVSZzc79pUxnyH9S68/KkJ7j1wttGDGsFp+e0wxu0ELtizNKd8EXBVva8u0exaK1yoZvjGFSXx7WgTe/GqkZMIZK2rSNjeoJ3Gfezjvwd4JycQAxnMxMZUIKWjFAE7Z73Q2OxAARTLIW9D7/4sp9k= Received: from CH3PR10MB7958.namprd10.prod.outlook.com (2603:10b6:610:1c9::10) by IA0PR10MB6745.namprd10.prod.outlook.com (2603:10b6:208:43f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.35; Thu, 30 May 2024 21:33:07 +0000 Received: from CH3PR10MB7958.namprd10.prod.outlook.com ([fe80::dbde:7e3c:e5de:811e]) by CH3PR10MB7958.namprd10.prod.outlook.com ([fe80::dbde:7e3c:e5de:811e%4]) with mapi id 15.20.7611.030; Thu, 30 May 2024 21:33:07 +0000 From: David Faust To: gcc-patches@gcc.gnu.org Cc: indu.bhagat@oracle.com, jose.marchesi@oracle.com, cupertino.miranda@oracle.com Subject: [PATCH v3 6/6] opts: allow any combination of DWARF, CTF, BTF Date: Thu, 30 May 2024 14:32:21 -0700 Message-ID: <20240530213222.440435-7-david.faust@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240530213222.440435-1-david.faust@oracle.com> References: <20240530213222.440435-1-david.faust@oracle.com> X-ClientProxiedBy: MW4PR04CA0138.namprd04.prod.outlook.com (2603:10b6:303:84::23) To CH3PR10MB7958.namprd10.prod.outlook.com (2603:10b6:610:1c9::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR10MB7958:EE_|IA0PR10MB6745:EE_ X-MS-Office365-Filtering-Correlation-Id: f1dccde5-4e5d-4eeb-0ace-08dc80f018a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: ostf1KfEdTzT0+pSZqfiBZwRziyEALZ+zAgVEOCvi2nZuYYx6we36NbzYrV8Ky9/2yWnlIW3rZmgJjS/tpN5njgBfBO4tbdd54udRZcczoTVEEQcxsd8jHbag3fUuMWX6K1+GUDUIUsUSWLryQCGzY5aqBmHRpqdntUQgEbdGEMEr5afHcsIj9aagV6tLIpagCIWj6HIiKMtUZPwP++Rrkg6XEc1jRQNG4wYBOEIGeAjHyxmSVxFI6PMaGSqN30qf/JVe3XQDmOjHUguQ/9PbSl4ucHmw6/GdJQSebPevSUn7UHLpTgmRJ6MN+uFq342FKU1rqDYKvqaJDNZuOCFFuA9qYIbHRlJsXB4Csf87Dp5fd4xtx6S2k5JQsIGfLe/tDLzWvoEMjKST3HuF9DtyrwdacNJ2uOvwcZW7ltLgxCXJXkrHeK6iDA3H6fOzcTtBkpQuKwKI1V7VuRPX1zxv/1B6+rlemx8qcdPkbi7x7UoIhHdlUPTlZRI8NjgivA8G0YMPHFQl7lkQ8u9Y+2D9Fbz01+6Bh49osNqhlkc6L3fgKQzQt0a3YpM1sov67GGlRiFiojrflBYlmz+zX3J7fqq8IMj27iUPlYP4xNDf856vgy7CeNb4/IRIO39zlkx4ibjtpjDEDkU4PwBdLxbnFjhmJ0Ck3PgpE6RgAA+pWUy/ME8FjFcqK+4a/MxMyKkjoslbu+jfsmbdKmsdRZD77+Bc/56Iiq476j+Ra52yN5OFaqPwO5j9BKKY8xC4H2iAjHMJ8paCcnO/tdruqMIommUU3JUr5LeP1LfUcSwfz6XV+LXIqM1ah+Ze5Q1zgQJ8yHvZSu8Oi+SeLK1eHNFpd6JFYWMZwmSgIIC16lQDDrBcKwSCeHu6iBJKdxGsGzp+XMDTbYQeH62eGqF10dA8ZdqhoD3owRmM0XDU+1izOgNxoYXUE+Y5hvJB+m13B7ORjo+xs23B1OboBe9+9Sse2YMAVJZgxFbQkaHe0QvKU70u8QUAmTMcipGkBmqylJD4frUCNM5i3EmKZgm9ttfAEZu7GPsk5+ZkErrkdZKnF6fj742QJnylBg8nSoYBFvgyxY26xXE1bI6rwPIpxoUyPBCj9zlCHVpZgV8FvkuE1XP6NE4ymwyZnjx5LVO4IGxvHMx0bDeZOeTiGTDLviAdRIRF++y+fBDuj9cZ8zOT3fhd0JpT65A4iZI1YAmez/vWjKdbVi4LopifX6Y60Jim9DWhqBv7jZmhJZMMHexkTnGewcAIrID8IBz2ZmVed1jVx5utaWrS6w/RV9JvsjSDg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH3PR10MB7958.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(366007)(1800799015); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8FiHU71ql7EjP7/3i7ry2IERuZYTbCBaPGa4ZSvkg5EHtbhPACZLuksLriWZOJDm8PosVIcPQMx8oSnTf4cosj+RI2/VJpTW+P6P2/bQXTahA+j6B33vGZKKGPlHVZQZzoKe7Lc+KwioP8sSJTrrPZruOb8Dw5eb6MOIk2rXDVVBpKTXLjEzMG0VExPkovbCo7GK5rgZGQRXqqPBhIeAMbKY9gfcUftbpW+dj6lZU8jgOr66iK2sHFK8uuYX5oy0F/SXkmntu0TYOuBFEGRvjrnQQ0E18KWLyUuqnv3w958rBCRF/e7nA9KoB/SQ48xxAZmOwhTnK41uQc/Qo7RmwOc+JN2LcJI9UnU31LHgqKeW6j5YoTLhvBMzf8KpX4YELA89QjyIz0F8RTixvcb6NqhtyIxvEw1SLP5P9JMH2AhX5+30VgbSkROOgMT0M/NYdk5QvIf/7bAIJgXfeHM8pFuJO4TUJaTbTPjBXoZukS/XxEAGVfVAwxAD8/7chGOdxUkWha6FwhgOpHxVqu37tTu3n7Ez08zm3nthpI+h5s4qSzu19wpyxUY8KJxsRXJS3Qkwr6JcapfgYCPP5pg+pczAavCpptzFKSADZq5UWpgydj9avHPDHWEK839gv68lhBPR8iFPEr63hjUNvxn0DS/WHVfNxEdGiy5DUBbPqselkB43DQG7EM3WmN9VyQHtEAlLJeKyNk/bPMiYUbsToUhuZMnAMkTQ/EuTuEE/Z/u6vkeJ2XWHElluVmJoIQli+qhI51V51wVhO99RRFUIveef+wZkXosnXWUkBZ8i8s2PckYBum2AEbdIDUxAMaGWHqBLY0b8kLPHqYM8ofP0VQa5DbQNXYaQZSRBM371YnE33skKzFkECW/lOcAVgI4pcVBVEJkEXqxDnC0+Eg7hqcAiUysXhnWWtz6eT472MPbishCLnf4Yy1obGau7FEeoJFjmnMhKM0LzXuuJnk89+EnMH4EikgmdX2XW6AqxiU74JuqHQE16kKIaHmX34uvxdFADzuUixLg8QTPL/zdbSOEtyZjuFOQepnxbIIDOgLPk3gm5jurCWmfBRXYDbkhVSetXwVd9f/vO9OUxKoJv4wW1uDhdBuETCjZG17O+o81AKD9wZOEj3r4er/N+R7JZkCriScgKgRAGLw2+hiwEcp5zELUDdtrTgq+LbawrpOPJnfwCN92tuAoVX7Q+nIgw9Bt2coVTvOOjjAb11OZag4g1CaQ1tHtTA8s3EWAQnE0d9i6HzeAJsfr3omNKBkiS00U/Vx8N13nroNV/hMQpHHKvoI72+zcqyvDu/QfMcG/1Io2by9FhLYRanSb+KTR1hU4Wkp3nkRainYk2AULD0kot2NIwROVxSD4+/49gXe/j4yuVLh5wridhvuUEoA9IXv0ZO4fQ+5UANhU3FA8+H+8AXNMCKmCaK1rDTMrPCVFOGLdyKUFPCTdnwZw0Plf/JbuRAWWW9wRfmI+GG30xN3qcgZQwlPukjn4v6kAwWoWORmGZ9agDck0t/vE+gAS6akRFb/2Cy53wv0ozlgQX3L4j5nrqs9fIVHpZP0fEMIEpCH2Et16siry2a1YU0SP/Uz0ur833wITDrs5eoQlaVg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: e2EHy6wm1lQ+6bjGU/pgdRXBBR0Qm8kzLBQn6py1F3K61Ezl5azSyrI23Qncl7sSRhaUk7KlmxK6mgqonnnXYkKJL0AomHgVBtgs/iC0q8eLFFhPgB1QgnaIk0QobiVkHdltJtPBJTm7Rm+kgZgVSgrBaRAxTyi8zZebAXFqwUNMQduTwS7+UEgkGvceA6RdHkKDgHwYFBpsKorlrApZ/ADdtBQTc38HD+IdpW9HWsFRj4ZU+a3cKP2xgj31KQdXfthBNsVGZnp16+IeKBj5yUuH69Ve6GO4unrhVIOakRlPnBAUSZcnHfryXNh5VFShg9sMEQScpt16GpLiJVjkIWA9S9R1bYqWUMBBtGzU0bwiQRJCZ4V2l+FCmHzyLkQdq0TscECBpFBGlYSvIKUK6iTCwadH01Dy6A2thXjbXA09ZCDSTKd+PA2CLsO5gtFzA8qRA0oLX/qejhMfq+meIAH/kR6qdua29UtpnqKn4rCGhTik0F9GKsBJh8jgde6iEg+Ovjl+BiyVYpakf6fWagpifZsCEG25xfxtOB+J00gMTFVdMLi9JlG1Aui5R5JtFAhY5a93KzbB6zX3eXfFTgYAsnMkgW/hxJ2QuGRTk0Q= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1dccde5-4e5d-4eeb-0ace-08dc80f018a9 X-MS-Exchange-CrossTenant-AuthSource: CH3PR10MB7958.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2024 21:33:07.5337 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nEC3VSMPdlnwdHiLr7s61zxTiuMmv6Il4Y2uJDgVyEytObNtMFqw9bdttWwauaWQPkwqyBAnJBaI+fW5gYBsQw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB6745 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-30_17,2024-05-30_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 spamscore=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 mlxlogscore=744 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405300161 X-Proofpoint-ORIG-GUID: Z86AWCJhdtPNXNhntQn9-ecxJmVUozIk X-Proofpoint-GUID: Z86AWCJhdtPNXNhntQn9-ecxJmVUozIk X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_DMARC_QUARANTINE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Previously it was not supported to generate both CTF and BTF debug info in the same compiler run, as both formats made incompatible changes to the same internal data structures. With the structural change in the prior patches, in particular the guarantee that CTF will always be fully emitted before any BTF translation occurs, there is no longer anything preventing generation of both CTF and BTF at the same time. This patch changes option parsing to allow any combination of -gdwarf, -gctf, and -gbtf at the same time. gcc/ * opts.cc (set_debug_level): Allow any combination of -gdwarf, -gctf and -gbtf at the same time. --- gcc/opts.cc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gcc/opts.cc b/gcc/opts.cc index f80d5d4ba8f9..d58bea096a5f 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -3505,21 +3505,15 @@ set_debug_level (uint32_t dinfo, int extended, const char *arg, } else { - /* Make and retain the choice if both CTF and DWARF debug info are to - be generated. */ - if (((dinfo == DWARF2_DEBUG) || (dinfo == CTF_DEBUG)) + /* Any combination of DWARF, CTF and BTF is allowed together. */ + if (((dinfo == DWARF2_DEBUG) || (dinfo == CTF_DEBUG) + || (dinfo == BTF_DEBUG)) && ((opts->x_write_symbols == (DWARF2_DEBUG|CTF_DEBUG)) + || (opts->x_write_symbols == (DWARF2_DEBUG|BTF_DEBUG)) + || (opts->x_write_symbols == (CTF_DEBUG|BTF_DEBUG)) || (opts->x_write_symbols == DWARF2_DEBUG) - || (opts->x_write_symbols == CTF_DEBUG))) - { - opts->x_write_symbols |= dinfo; - opts_set->x_write_symbols |= dinfo; - } - /* However, CTF and BTF are not allowed together at this time. */ - else if (((dinfo == DWARF2_DEBUG) || (dinfo == BTF_DEBUG)) - && ((opts->x_write_symbols == (DWARF2_DEBUG|BTF_DEBUG)) - || (opts->x_write_symbols == DWARF2_DEBUG) - || (opts->x_write_symbols == BTF_DEBUG))) + || (opts->x_write_symbols == CTF_DEBUG) + || (opts->x_write_symbols == BTF_DEBUG))) { opts->x_write_symbols |= dinfo; opts_set->x_write_symbols |= dinfo;