From patchwork Tue Jun 11 19:01:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 1946494 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=GkWlCPWV; 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=S7upyntj; 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 4VzJ5d07Hkz20Py for ; Wed, 12 Jun 2024 05:05:09 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3B8663861034 for ; Tue, 11 Jun 2024 19:05:07 +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 0D8DB385ED4C for ; Tue, 11 Jun 2024 19:03:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0D8DB385ED4C Authentication-Results: sourceware.org; dmarc=pass (p=reject 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 0D8DB385ED4C 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=1718132594; cv=pass; b=f4p0vmSteu9gtIxlBxAZ7LL3nWQRADcQT1lq42pz2QZhIvQmXGR3HY451IvX02iG8S7Nz8XvNcii5Jm2zFFmzoj0Aa0FileN8HGKPHqQO0p9vWip+IQS4L0P1kr2UaqbPdw5GiLnUbTmql9PHg/n847rAThIg4lQ2SLu+8BLolM= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1718132594; c=relaxed/simple; bh=wVtLyUMx+pDoYSaM5Ra4Uo+7bBzBWxogdq2DM2cqOSQ=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=kEVLBg0hqOgJxItDKXgkH1M57cdgLqpz7icFvTZCeN9j/EyYDWM6AsHbxlTQVOinxmqRAcqX9Y2s6zFeVBlXDu4ddsfKwIwtrX/XKEvplySmtvUYXMbhsB2AEvErtbZOSISFoXkZlqNbirCHf+5fskPDAC8lcCvtXLtHKxeF2ys= 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.18.1.2/8.18.1.2) with ESMTP id 45BFn4Jw028034 for ; Tue, 11 Jun 2024 19:03:12 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=F2sfyswTKb4q2LbxbRTiC+Jo+e9airrfnbj4ehU3v7w=; b= GkWlCPWVqt3FSJCn5jdZ35Iv8LkFaAnpQiRBAwbMCANp+0/UfMGmjn09PhFSS35L n0nz1G69AEfgaCIxNza9laOltRA+56U9B2TV4G+MeKLj5949knEnXzj//8fFSas+ AUvn0QhLriC19PuqE86OzLTSqk1zlWt5Clp0Vi8XYIfNqyLz4KHs3bX0yDv6qffg LJvlKdOeATdXjrcEumopuHNvkLCLZ2NOYBujJZxRJqivsGf/Yv9rxH9xSY8uDAfn IwZQafh6XuXESoOiAW5PbU3cebzDteaDigvfSZrI8QLsljxTdXwCLEVsg0fbznqN WNf0yXdisLz9Rl45yJPwtQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ymh1mdknd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 11 Jun 2024 19:03:12 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 45BIRgHe019928 for ; Tue, 11 Jun 2024 19:03:11 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2040.outbound.protection.outlook.com [104.47.73.40]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ync8xn7gu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 11 Jun 2024 19:03:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oUM7ye9BnrAkHEWEEtTvdmqQwXUYfjL49qQ5SaL2epTwsCXERhdfE4nhYe+ygXO0vJER8//R5LcLISJasSV+AdHpsP+Xi58VhyGfmKt8qmcJ8i3CulkjWTrSYTc9czDbag5WBcaxPpXIHiFSSi7A0+ToXJ8j3+OZvBAz5fGQ+xagA1nHSzT2cRkhgAU3UaWg9SowKdinSFQpDB5IdqoR9bWsn6YYQCAnR71yZ0k4nWzwGoUUhIV17DYWOfET+WzJOlkCRdH2QFbHCMDQv6u7VpDFa3kRDzj3UflA0JvuezScBvWMM97IJrLL/yzK1rOV0KAeaLp0EnMp4XISE6ZU4w== 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=F2sfyswTKb4q2LbxbRTiC+Jo+e9airrfnbj4ehU3v7w=; b=GSdyclQBmmNEc8D/7pgZ5lNjiEIrNlBnpFOSt7sydVLc+LtZncfJa+dyqiFn1BxySGE6XxgGxPz6RhRX5iixOqKT/Yhl1vNnPjI8McX2bnQCJCMZFSe3jbJ8s4OhQYE89FdeTxIYwikksVcc4yWdjV7mWgdW/qbp2xUC+OsZMz55O8t3Lp7vJtv1KhtSyg6r4Vs/1wbcl5B5PzFX+sdD30TB2lxdwvI7NDmlSYSollHsuJ4fMSAIPKC+1OfwCXcWvZgq+EkbcEMsGkverboNqhGoxQUbY5pG0Yj6N6mV5GcdocIwGK/BsEgnUhGut/YAwJacpgyLdWbttit+0/vf8Q== 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=F2sfyswTKb4q2LbxbRTiC+Jo+e9airrfnbj4ehU3v7w=; b=S7upyntjUmpdHP4+k5bug6jsar3BRAnCStqqSjiQfy+EvtGAgEfuM0Jp8RRSzJw2+ByBBVybDZRy8Qg52dXkStbUnYi+sobhT6wnAqXvz/6NeY3q4DzduK/N52XtNX+nmwfvSYOFWGLaIacBcv82iMykwQHcHiW0LSsLVvkyQCw= Received: from DS0PR10MB7953.namprd10.prod.outlook.com (2603:10b6:8:1a1::22) by CH2PR10MB4134.namprd10.prod.outlook.com (2603:10b6:610:a7::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.39; Tue, 11 Jun 2024 19:03:08 +0000 Received: from DS0PR10MB7953.namprd10.prod.outlook.com ([fe80::5b2d:d28c:8773:c84]) by DS0PR10MB7953.namprd10.prod.outlook.com ([fe80::5b2d:d28c:8773:c84%5]) with mapi id 15.20.7633.036; Tue, 11 Jun 2024 19:03:05 +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 v4 6/6] opts: allow any combination of DWARF, CTF, BTF Date: Tue, 11 Jun 2024 12:01:45 -0700 Message-ID: <20240611190145.115887-7-david.faust@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240611190145.115887-1-david.faust@oracle.com> References: <20240611190145.115887-1-david.faust@oracle.com> X-ClientProxiedBy: MW4PR04CA0146.namprd04.prod.outlook.com (2603:10b6:303:84::31) To DS0PR10MB7953.namprd10.prod.outlook.com (2603:10b6:8:1a1::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7953:EE_|CH2PR10MB4134:EE_ X-MS-Office365-Filtering-Correlation-Id: 70ad6107-4734-48f6-be9d-08dc8a491fb5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230032|1800799016|366008|376006; X-Microsoft-Antispam-Message-Info: eKWVPtGOj09z2ePpYAT2Ftc8VZKwf5j/c/bkHlTvvXDLl3bCZ5Ew71VCo8y+pMfMhtRzQz6Y42memae4XUhJ6NXIqQr8pY/2wvK/PNfOX8uM5YwtSVhikYl6v/yD2/R0gXE4Ujfm+Uf20Viz1FRtTJI3nLOXQbSejRY4FNcfXzwpMrjIQ38lsuJYJVCeH2PdU7eF8KtMGXzClA/KFcXcrC6M8S/AMEHzRQTpYiPy5rBeQZ3pL6wdU6d63gRemmpAod2NwxD11jaPJVw2LZdvhNdPVLmk5QLtX2Ly/Ypioz9cMLzk/9KBs6+nwS9oAUdI8Xw8OvZTYzixk48Fu+me4FfnbGj6GwvDAjxvHaQCfgZBixm1W9DqR9Eio1GcQNQgnJvy0hwNivmeZsfexojtBLs/AUg52C4n9JWxGNoUI+2amF7QXOWedxfvz5gKnfZVGqcpKo4Bya4gbDVMhOmGncaFyRGoUIpTSux8P5obN7Fed85EA2cJ2NgVmtbFny8usB9gd/vA7h0HdMWFqVDF4+VsmDZp6+6cb2ws6PWkhzRBOZbxE6otlLTSQcrNTR9OKvXDqbawA/I5bbpE8M3Fp6xzuMx5tnnvsozpL9x7iQFe97ph+SOaxjy22wbOfNtOt2I9n5WPnYyWtl+y6KnVbgi0JDxnQzV30FISBoScJHVbskf8knue/BEywS1zqtzPmgmHim8vxbtJM1b1RqY1VJA8f/t6HzWSQuGAdtZ/SrV0VBcpNpPjye8DphDerV1ibTrsP1QVRaic/89w6bY7fM/PKLiuv6VuoWtAwqPgxDCTyFpVcCudorSVcYBTpgHa9a+gPN+cCpQbItzoVxUd0QVQL+oQdyjwdEvdmH6TG4wQAbRhD7IzU6Up8rwhTP9qSukktD7kbH/DPxx6A/GsauPJGxZjF4CHquQWrzMB0nVG8j5Gu7lr5DZvSdK+VS+QmFqmrnPwLMc3qp+yF/Wtk4Fh4Xbn1Xg/22cdCvIrzPGkffNaLX+NImNjpZNmGd9ePSl0mS1rMLHR3uUGkk03ByG8KcYog5YCpS6i6iGQAXPuzER75tQ5z6m2aJHa3VNFC+zOy/reooJBDF2erxoQlF/m491lqNW17yN0EcpDSDt31RcLAc1usfq6VMrsPnBSudTrUYgjO/TJ+q8iWxdqZutUgoDEtBW3anQFnzgPpThvnd0xbmwIYMXguG1zcfdcG/c7BmoJ/kxoYUJqwmmFjFjQWMKY/e61zBle6ch7PfG6vALjLAdLbUzwyaWWjjfMj3m1T4FrBMwTvmgW8rqEcA== 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:(13230032)(1800799016)(366008)(376006); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TlCIpUmT1+Vr9j6vMK/cAfo4pyaqvA8xt9BPREBArFH5zliYXmxrNb0diPmNAYY4PRWoP53rNLFr7+pB+NVXNUZO3x31PlEIv6bDZfd5PKJf3EUjMvpyNmSW/TgZLDeWpNkIp3760FQpqtvaAgcciO3OBGIl4d9hj/eEU6j3ukiVPHYeUKIJLQmMC+9px4wJwZ+4ID18AzGtjhiYLGqAKLfrGaToP7bszvLPP6P4UtxavfiFLxQVPvTP8QK3FqVkZ9WcNXMt41lCFmQX1K0t0u3WJyXgVFAh8x75RV8rhlVZIYdWWU612fl0aW74ytfzw0Nro2aIbV1qmL/4BdApCTannNDD9Lh0pS8ElYLZKy9QT0dY29iuc3xXVP/TFtA/0Lbs3pBUsufBAVD6rFpaH53Uz+PIhM+TJaFsIiwbpFOVfVKO2nkJf43yllxR7vG0sZPhMhUFKrG98NIO6bQeCT/sws8zbUc5nxP469CwUbOuFVMDh0MF0pZ4fj/sIBDWmk500WL58Jff5ygRFFh9/dDkM0RizvtsOCx7vPVr1kyK5bV2QpfLrTf5t3I1LpI4bMEVlJ1d47e/FCdWa4+7QQNo/cSb8aOBVFZCHEDrfQQpx6klA0J1++uLcrfF7Lork0hrOglYOyWjfBmKOYpezNJcEWGGqqrjNVKvRWFeu3Az28bw0l8+FvJXn3lHWTk8tePwZWRzQqTdbhCp3CAZ+yho5/UTDMk2+ok3XKXv5GWumT6/cnaQKAdOM32pu83dKiHmow2R/x/CSSEeIgqgSL5R7n/paWBd40qzzvJ8c0LVa7FS6xHy1lzce41w3JQwaJ3arehK8fU1OQrzFhM/9rWlHzEThN2B+FamZIHICxGDII86Wl3RkftOYBKOLCWET6L/brYbnpsoG8jU/3Uj094FGHQJln3TaLgDnJOh1BtuhvK9J1Pt83KEsvy3CWrlptCaa1ZSowTHutMzMX/dBwGnZ/VZsjCy6ufihvStwV+8MxLKiY5v9ZuKmkssFRj1FMb5pfu3sd5IVYPvxGdh5f5NS4j+JAizz7U1vTlAqy/vg1ZLRMEQTr2Sjfw9vXjotYiiGHgQ+mk/O6+ensNQY4WcqFVhV75g3wLIptcqAQiYqZvcyc3KMz5TxrRYD5JweJy61z+h29iaQ8Q/o7twfXFPnKqlDyT4CodRJZsyi2IG6INXmehz+pwmT/AqZmxDb5Zc49BYmpRE09SGsIcexFvv+K6SoP6YlCZM3jucYWVdnfEVqe8BDonho/yV75JzQm92VnudnzWWPALyxdwHKUtZpMMo0VlnS/zqopDxwv1XKSANm3t8tTrGnOiXJTkiMFWP5lPbXF29feGiUGYAlxcOnurPEbJnAKiofZX2sKuhQZBEAToeCvyuy8/XEgjGQcWCimHogU6FimU5BWotNEAJxd2hrQ3QKzjZ+CwmxohmMW20vZCh0L7IpcwCkH9R7RsIFDNHYA+Ks/JCF9oQyLVA0ZjwYrHJCTaJMuTs5migsuFO8cM9z859ez0pQY3mpzMmIbiSjkRT5eV0rT1v2MT/eHEr9Ik0iggyS/9/UyBzvAa0UrHrhMnbhOLCjBRLuMIhWcrH2gr4lVS1BGuP8A== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Bd2J8DVtcxU5DChQElMJyTjbJqcplnkZxIJfDxgh7MISqaGMuubSqSc2+t6yziUkN/qnsDn47SZfUPwyABdMvg6Gr/UGyfwrpuy+9TFIVarZd5Buk3BgHnlbPuj3lt+nRzJittEDUAvywDL6SqykNNadswk7Kjx31EF9b8mC0jDZ7hNuB/JGOmM8ZKgnsq24jyUZ50gx0L+Cd4Q7O6g2ARcdYxvAQ7GuPpCNItqX29VNRMkqQpNCuVPmLMcyQj7wD31CnBo71n2PIp0rdDS0mXCAfKL6RMCHG46kAF2wzLjH2mzTzxE2XibBF+eYcXdrp28Zb8PbVVaBEQO/uYMc6KzzZm22dKWoc8tmdnAjiI93US/RG6upyoz3fpR3ovpXqbfDZtSXiD3L9gdFfRl6WTrUJLBDLGazrvluJbcMdXlSY/v0UjHi/nQqsVF3rZHXCBxpA4K4PXMcHpvGXiLuWClhhPp717z4urkgR653I7HZP7vATf+hveOBAvnabno+pqLDdFV98GChT5gd95Q8TMyVzsakaxcZAGCmuDOvHSsP7DbtXRh7g3FFqLSmTeQpUGqSc77Z5GXzMdh88IXAk/dzIipeQkL5vVSCNm0/SPI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70ad6107-4734-48f6-be9d-08dc8a491fb5 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7953.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 19:03:05.0581 (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: f4PEtGC1nO9XZZeKIjrUYMff+EHfeYGOVjX3nFxJmNgDBXPIEhDBtZjKgk7j4gJdaxFZqX9O5KQluEAtwYOvcw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4134 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-11_09,2024-06-11_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=934 bulkscore=0 malwarescore=0 spamscore=0 phishscore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406110130 X-Proofpoint-ORIG-GUID: vixXUBwkKEzCfJgNWkcTxnEfa_qbEg1h X-Proofpoint-GUID: vixXUBwkKEzCfJgNWkcTxnEfa_qbEg1h X-Spam-Status: No, score=-13.7 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, 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 to be enabled at the same time. gcc/testsuite/ * gcc.dg/debug/btf/btf-3.c: New test. * gcc.dg/debug/btf/btf-4.c: Likewise. * gcc.dg/debug/btf/btf-5.c: Likewise. --- gcc/opts.cc | 20 +++++--------------- gcc/testsuite/gcc.dg/debug/btf/btf-3.c | 8 ++++++++ gcc/testsuite/gcc.dg/debug/btf/btf-4.c | 8 ++++++++ gcc/testsuite/gcc.dg/debug/btf/btf-5.c | 9 +++++++++ 4 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/debug/btf/btf-3.c create mode 100644 gcc/testsuite/gcc.dg/debug/btf/btf-4.c create mode 100644 gcc/testsuite/gcc.dg/debug/btf/btf-5.c diff --git a/gcc/opts.cc b/gcc/opts.cc index 1b1b46455af6..7e9f2d91172b 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -3506,21 +3506,11 @@ 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)) - && ((opts->x_write_symbols == (DWARF2_DEBUG|CTF_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))) + /* Any combination of DWARF, CTF and BTF is allowed. */ + if (((dinfo == DWARF2_DEBUG) || (dinfo == CTF_DEBUG) + || (dinfo == BTF_DEBUG)) + && ((opts->x_write_symbols | (DWARF2_DEBUG | CTF_DEBUG | BTF_DEBUG)) + == (DWARF2_DEBUG | CTF_DEBUG | BTF_DEBUG))) { opts->x_write_symbols |= dinfo; opts_set->x_write_symbols |= dinfo; diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-3.c b/gcc/testsuite/gcc.dg/debug/btf/btf-3.c new file mode 100644 index 000000000000..93c8164a2a54 --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-3.c @@ -0,0 +1,8 @@ +/* Verify that BTF debug info can co-exist with DWARF. */ +/* { dg-do compile } */ +/* { dg-options "-gdwarf -gbtf -dA" } */ +/* { dg-final { scan-assembler "0xeb9f.*btf_magic" } } */ +/* { dg-final { scan-assembler "DWARF version number" } } */ + +void func (void) +{ } diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-4.c b/gcc/testsuite/gcc.dg/debug/btf/btf-4.c new file mode 100644 index 000000000000..b087917188bb --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-4.c @@ -0,0 +1,8 @@ +/* Verify that BTF debug info can co-exist with CTF. */ +/* { dg-do compile } */ +/* { dg-options "-gctf -gbtf -dA" } */ +/* { dg-final { scan-assembler "0xeb9f.*btf_magic" } } */ +/* { dg-final { scan-assembler "0xdff2.*CTF preamble magic number" } } */ + +void func (void) +{ } diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-5.c b/gcc/testsuite/gcc.dg/debug/btf/btf-5.c new file mode 100644 index 000000000000..45267b5fc422 --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-5.c @@ -0,0 +1,9 @@ +/* Verify that BTF, CTF and DWARF can all co-exist happily. */ +/* { dg-do compile } */ +/* { dg-options "-gctf -gbtf -gdwarf -dA" } */ +/* { dg-final { scan-assembler "0xeb9f.*btf_magic" } } */ +/* { dg-final { scan-assembler "0xdff2.*CTF preamble magic number" } } */ +/* { dg-final { scan-assembler "DWARF version number" } } */ + +void func (void) +{ }