From patchwork Thu May 2 17:11:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 1930749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.a=rsa-sha256 header.s=corp-2023-11-20 header.b=A0Wg+lAF; dkim=pass (1024-bit key; unprotected) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-oracle-onmicrosoft-com header.b=a1Q/crMK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; 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 [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4VVgS74sdqz1ydX for ; Fri, 3 May 2024 03:10:47 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D3B6D384AB67 for ; Thu, 2 May 2024 17:10:45 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 4FDEE385840F for ; Thu, 2 May 2024 17:09:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4FDEE385840F 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 4FDEE385840F Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1714669743; cv=pass; b=mO0hEVBFNTSqkIHhf/3eWFlffkOlRoNyJF+jAxa3MnF4RrhviP4Wyl1ZzLT5Suzt2uO7BZAFLRkPI1An3Cd1RkyfYQhVJ7gndBH337F7/urlHGtICsWGLfxWhQqrdTprUPxUnv1eIUETQmIWWy/T5EcPIi4GkNMpz/FM6/PqFwc= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1714669743; c=relaxed/simple; bh=6otg80CbSEfH7KFeyay0Z3jE1ht6QXolLpgkZUngEsU=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=O0euW+xr0won+HkCISZG4RDQSIcIPZpc1cnPTYDweTsX5NpNfl2GUddWlcQbLTbpPapsrM2nOil66Lr0YwnBg/qLwN/npQbPR4ZmYjcA6ByvzA8QNywBLGJOyHaILq7NrW13yLihCIOp2qj6v/YqLuyIcPvKbtDQp4imemjE4bQ= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 442Fhm50025112 for ; Thu, 2 May 2024 17:09:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=ZEAQI8KlInk3N19Dp1DqGYmJlFq3ufyIO0mLuTviZ3c=; b=A0Wg+lAFoEX/A8vpRiXyedib15OyRJpuHVXxvKpmwWgbEdNWXilRx6KJn/n+lS+krDkb O/kaSKiulklnH6J8/+MvqaiXj/SJvqYd71j0cN4VXW6u/tTUJ2mCAYSnByhOMFBIFjg/ r6ETcX4tHgBTY594pjr3v+CWMNjedIzZuGU0rzm95r40IGTrgK7KcwxrZenWvoCOgv8D t69aux5LawQmJ5r6TngjMMYyVRiYbw7z7RUqKlAjOTGw0x0RQ62afGykd/qvRQOnEsTZ NQZBWkztCWTznjis2YKeNefjT67L0eCI3hXPDfIjXQUbetry0h/uU8CnlC4HD2IFWz+0 ig== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xrr54pw83-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 02 May 2024 17:09:00 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 442GgqB1039970 for ; Thu, 2 May 2024 17:08:59 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2168.outbound.protection.outlook.com [104.47.73.168]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xrqtbcgbp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 02 May 2024 17:08:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IqTj8kS/KlLeQ0KAMHUB/NLC6ALqibhE2ue4wCKgJTuVYF1Ww8w/RAVAcNRei3Sj01pyuM7Zeu5zL3wEsvWYp4IXgGLv6XMQl9W41h2O1+xgonfnHhSvHTE16MKWOKdEIBFp7FyG21d9q7AVu8fKhNG8U7A2FmmRBSA3vBP2KmdQG/Vu1BRfBLhcbAo0ltVotFnSCFfevqLdvRE8y88bx24Q1evgb00kH13mc6JQ3xiEBGFhQAA4v1mw+W/mqAEqiVMm1JGZANpSf8fFJMScnE8wE27vWEvBKvPpMKfMr4Xj3jEaYwqjL01USZHHl08FwnX25xUeaIoDt46eA8zdmg== 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=ZEAQI8KlInk3N19Dp1DqGYmJlFq3ufyIO0mLuTviZ3c=; b=WdsONtENbfU7SzzvaQ+MsztnUItbjQg/4UKOSIKkFuB+qPvY7s9r27Ly3VRe6DpZOwFgggi/YalJRqNoJvqTEaOqdFQ5E7kmAfN/lMDU24F/f2V2g9pB+Il/GfxpCxkBsfBO4pXabP+U/Up0bTLir9I8OjdO2u4KmQglJUasl3rC3V/VPZ+a/rjx4Llc2Nk1IgckvzRlJ3YGKx5hchaSQ7bf1Fh1hOHEUsbM+jP66nAuU2fXAeW3pobuTSkcSDM+sck5szMKTCRZCVvpCCCWejlfuvwNqSLje6iGxpIW6Ui4tC+kSbEsZ5Rh++xPdG37ejwbVo7cfNbC+9Mm+g8c0w== 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=ZEAQI8KlInk3N19Dp1DqGYmJlFq3ufyIO0mLuTviZ3c=; b=a1Q/crMKOurbFX/HleRjRDDcOMPja0VtUIgUPhD1DGj4wksbd2jPX9Wv2XoQnUTEmPtolS/ARYRaierMxchDYoaJ6I8OEeKJJhNrmiMLNQHnRdGElgLts13JwnQj3oHWmGhzWh5dQT+zSYjp/aCcZzofqx1GwfYrcDw+d0B1WTA= Received: from DS0PR10MB7953.namprd10.prod.outlook.com (2603:10b6:8:1a1::22) by CYXPR10MB7898.namprd10.prod.outlook.com (2603:10b6:930:dd::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.30; Thu, 2 May 2024 17:08:57 +0000 Received: from DS0PR10MB7953.namprd10.prod.outlook.com ([fe80::ddec:934d:1117:499d]) by DS0PR10MB7953.namprd10.prod.outlook.com ([fe80::ddec:934d:1117:499d%3]) with mapi id 15.20.7544.029; Thu, 2 May 2024 17:08:57 +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 v2 2/6] opts: allow any combination of DWARF, CTF, BTF Date: Thu, 2 May 2024 10:11:27 -0700 Message-ID: <20240502171132.95601-3-david.faust@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240502171132.95601-1-david.faust@oracle.com> References: <20240502171132.95601-1-david.faust@oracle.com> X-ClientProxiedBy: MW4PR03CA0243.namprd03.prod.outlook.com (2603:10b6:303:b4::8) To DS0PR10MB7953.namprd10.prod.outlook.com (2603:10b6:8:1a1::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7953:EE_|CYXPR10MB7898:EE_ X-MS-Office365-Filtering-Correlation-Id: fb5961de-5567-486e-085e-08dc6aca8dde X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|1800799015|376005; X-Microsoft-Antispam-Message-Info: qm2w9/AMIhks28m5lB4WlcK9IuU3IFM/XMq5BsttkwUM+QVXulmdtCXMkeOGRd2rBQ+v85pL2mXN9YeM92iaMUtmdhWeipohlsYYkkQQgkX0aVinSXKd7IPUL/DjOJ4eyi4FvzgtYRkeIW+nZOrL00o8PshX81Bi0T4yFTHJvcA+Ppckew6bHHbt240KMLE2XL1qFGPM40QrW/t9z/tO5bgye33tq7+NfCmDHbZZxrQrwOCZviWse/QCqlVtrjGXckGjXUnVowOvxLAQEYk5MT/ewKjoBG5JVzfH2YiMhNliwCwXkOwUAZA0zH0ADOt7JB+LIu0NlqzXJod5Rsfbk4QeGunW1ApMrat0j0lQL0zCXgaPd/uFjs0mdGVGfBROxq19tV6dMLyd/gl6qgNQ0OjGQt14fLmaknEaMEZiRBRne1TmDTJ5DIFp73bKuqPtnjrRBCGiXZFe0HH5hxOYT59kUZ0I1ut+6DDktVYV235RFvDPsDIXTa2gJxh+vcLQTDDKOzUyyoSn96yhHmxYfEukEDZniFIBUUp1nO/ShVDwyqtQGResng/E0ECPs3oraSCzwYzmFuB0Sxjg/xOJ5V9/mDnvLk04EgGU3bw9IBl1Rnv6JLL8NvO5fsGZG68tN5EklHa1S22pILH1uaILlx0aiKnN/JcMvCx9v0tXKornJtHpL+82JzSbWeqBXzACIbPPMGUZl3Mb9evrJYedp5UMoShAxS5hHLkO2tBYOM7b+MFfVoZZ5rra0Qe/8bUmRrGz6BjkYJ/YwnqVReH5aeEfnuvDchoFoAZnKrt4RSCzDJoIktIfR6iLdggHtnhHFYG+hA6XL5GteALjGrNh/k2nfp9rb68BKXTyJ70t/v3KWx6B1uYvZEqIOrmhB9k4gA6Pr4u2LRwnGAxvglmpVueMSwESkX6uaeUwNMnG1CnUxso3Pr7TxIfEzRP4s4sr4GNE7znR3CfoyLt74SP4Dca53k4IzoO9VcbrtjC3uNwNEHq87Zv8wNP7f7/whDIKnRWlpTCkpvTeyrvP/U6Ky90zEtNlac+6f+ifFTDD0d9Y0Y4SQEJL9E2Zo4nVj4imyeH+hGp3DpzsaZins5/k4trx3MOb8d8xmBJSNWXHehVCGf6CD1qodqgl+fU1T1aZyLgLH/8mHe7CSquMWZD66GKoeoLUxqiY0OX9EWWZ8vy16e6S7KrL/UYsWmA221OsXd6SwH92nEd4s+KaNb0+bM38wHOfOnXgPq2H0WudwPXi34Jy3q5h0v34D1BqkXUeyFTrJYm/geLbUV8mqsRMew== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS0PR10MB7953.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366007)(1800799015)(376005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KHngBv66X/JF2L7mKAVZjnMTvQMbNa+FNU2oQiiXfiBTrQsHDYxa2fPsAGw1UpmzNcDs3V8hNYqC1kCiD6bvgxQ3sAbbom74QcTI6lZiHvisYMeSX8XN5vYoa/99SBwax/tBG9EU4Ic/eQKG27Lp3nXPUZrEB5RKgbej2p4zXB2J13le0HnrcbbaNnnXRs6z2jRyLvc0Km7PMOx17Bziv1W+dsdeH11St6IPvUUJGbLZJpqiTlY7VRXdd6sOdayL7tqtLqpwNplJEVUbJrtFJ6PiJI4YFX6Ks5CXLEf/ojWhUy+6yG8Wu7d1FBtJqEZm9qCdCjwOpiaR7wYrnHxacAedW2jUHAzv0ld0GZazwSnVIAg0GJie7sTNeD4W9tOBO3BjEYe4VNVg9+3OBGyg0MWfpaiLeA7TLiXzkBhuqbFJS6pYpclCyX/4d6v586aOvDpQPwFh8elby3bFHn0NR5tbEc5m1yrRGzjjk5qvBZppWCJHPjeKs7WnfVR6N3L+n+F8PJpQhYUdHgrQWjGcnmkUoyTkOY3inYLLYLLLwvVchRcvxuL19XHvbsaBPSWi+kdXdZORmsx2xrZ0mZXpifAxGloONiMI/2iYTFA7WBZFsC/ECyHq8jZuiuT+sK7k66+8T7cEHDk+Vqimg/ayS4KayPrtfk7yt8b6xR8ZByn8qXbjRQKk5b3O2p/UYrJv5HsZRfWx2z4NyBgptu5CZhflRmxeSuM6nrl/2DKbOEoB+HxGuZ0bi+uA97mSoovOMy2yNsJooiD3/So+RyHdOtW8BsIHJ4bdUYz9EH5sjD2h/k5yat0hguEP0oBApJp7B/1W1qrSGdmRPJT1KfAMNtBCFnRgg3xP+BVmfYpg9R3IuSRuxAa3+1iHrIZMfSOFj8Nn0DMBEA2C3Hv9zissZgjrBn4iiFkjFa5lYzd8C1jpm9TjuNAfe5EfhgdhQtnpaHXqcGWpVs57jcdeDvOW4Dab+ljOBMsiL9HWis0yurgnm9IUwgI2tHAMhpsl7tlvjZLPIARI/oNdNYIz46j3WW8cba10RdvFhJcnqW5ScvRZfuSR5fgCbarEBT3MCqgxsIscQ5nqAaITn7KBqfEA7w42YDStMF79Q4XxxDw+zXJ0XNJOp/XsQ54paugPUuj8hvDRqHg34NtZSGw80tsXJDWwWfRtCoNY8ugXovmRQtL0tcauwzbnUI8Fv/QGsbjMUKB0F37+DX02tB6+vyQRx6MzOaFLpFXHC3iU21wKqg1degQ1afppITSN5DnSxso/QfQ9CLO2k6iOsbhLg9JUl+dSV84UEHQQHcx4qRGgChZEdywcSetFmgaHA/lta1dKVHB8R9kpoS5q2cMNkSfQSGOFtFaJhD70NA8hOCwua3j7c7gkcGfHU2UDNrcUx7w/Mdcgqyn1cmWwJWEcqIXEBy+kXgDBs7ssff3YW7n8W2agX6VrZFQgAkCZ+b3sinxPCDZjlUXoR0tBL3PzMzySLC1vAQ/SaqyMRAdTywaeukrNZ8tvhrciYTqyFbC4JyeQ2+gWQSdvYHi0E+/oOjju+gXw+J5Fv4akTNkIlRvVbLOcXTPFfYUQ64rqaWYmsEysub/Yd3ETenW8srVmkQRUnQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: WpGyqeG2bluU0J+NEtxDZH2iWTf/ICxzy29XtMPDZmGw1EzfwUPu3qpEOIJIF7xiZo2b5fiDryb4w9A65MksaGZYNmsd74hrV60bAkAWRDQrxt2IBuLX/ByIEUwx+VpE6Wn4SQqecmlAOQs2sRCvzHz0B9Rrvldrt2ujXBHrPyA3/etWQWaXaFs60srecnMTJHb2Uwj/RrU4n14kvCwFD+hsyHTRDNXAz48xRvCGIsaSizvZGsFgehKh0pvlOUE7JYIqFn55STYzqPdDiCskFp6yXS87cZAkXTOdChq2pQg0i2ap3ZN7D4Wd5Rm+nVi65ZuLm+bVIHF2PIfiUesd7x7C5T4ldROBI1SZ3TpbsUP2w3m5SEO04QRZWBwYEJsxk/RtOXu1a+1oEm9qHvG4a1oHLR/8+g6E/vpLOGus+k/uwrcOuosLKJKVj1f2JPkvF0JoD7IRSZATlqBXp2f5EeRJyBg462p3pFf+i0QGcW12ftpKCe25mG7cIcJP5/1GjElx3qTfpZR56qZQ1ZlWZqv3Vt3tQzY6CNcwpO5uCYoduvey4isNogVUF5R+GSd9SWfbZGXXyTdjYWWKKd0p/g/yubL0qZ4aqDpuGXPfl6g= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb5961de-5567-486e-085e-08dc6aca8dde X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7953.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2024 17:08:57.6667 (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: guycEbbfC+GLE1ANneVYPFgAA4luPYGZr3mewXtBC1v+D2OTcHDJFy9TqS/HVsWAoVkMazCtoz7FbcPSJMvHmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7898 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-02_08,2024-05-02_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 mlxlogscore=781 bulkscore=0 suspectscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2405020112 X-Proofpoint-ORIG-GUID: qswiJT0A_xrOp1m9JKXVs3iQfSMThxu0 X-Proofpoint-GUID: qswiJT0A_xrOp1m9JKXVs3iQfSMThxu0 X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP 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 patch, 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 | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/gcc/opts.cc b/gcc/opts.cc index 3333600e0ea..0a00eb6e2da 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -3488,21 +3488,14 @@ 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;