From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 561CF940A10 for ; Thu, 14 Dec 2023 00:36:14 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=w2HfLqSvN/rpYExgqz6XWL0/E0BcscoWSrlPqiC1i9g=; c=relaxed/simple; d=groups.io; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject:To:Cc:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20140610; t=1702514172; v=1; b=GNUJpm2S3JT69WOO8zBC3hhadSq7eMUehu+wzkq7RXRdXGoS0FlkFEcx74fBtAg+zOSbjLw0 uVreN7Zwif8YONYvPZZ9E8uk6iSpS05YWJRlEFHToDieJ2kORH1QPxcDkMk3IFrCMkmevzIdybk oZvs9WQfnUla6TpV7yeLuhlQ= X-Received: by 127.0.0.2 with SMTP id OxPaYY7687511x7TgmjlnLkF; Wed, 13 Dec 2023 16:36:12 -0800 X-Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web11.10294.1702514171872545848 for ; Wed, 13 Dec 2023 16:36:12 -0800 X-Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3364514fe31so268807f8f.1 for ; Wed, 13 Dec 2023 16:36:11 -0800 (PST) X-Gm-Message-State: Wp4w2GQ83avFG1D1RAKGQp83x7686176AA= X-Google-Smtp-Source: AGHT+IGPoL2vI3nl8JeO7GU6sBM8nT01/cJdsvmHkW8ryMW1ekPsh8ws5zJnPUFjsnbevfctmr6zg25ZSLkXb/JJkGw= X-Received: by 2002:adf:e288:0:b0:336:18c6:b191 with SMTP id v8-20020adfe288000000b0033618c6b191mr3830420wri.132.1702514169715; Wed, 13 Dec 2023 16:36:09 -0800 (PST) MIME-Version: 1.0 References: <20231213230741.168859-1-mjsbeaton@gmail.com> In-Reply-To: From: "Mike Beaton" Date: Thu, 14 Dec 2023 00:35:58 +0000 Message-ID: Subject: Re: [edk2-devel] [PATCH V3] DebugLib: Update DEBUG macro used when MDEPKG_NDEBUG is defined To: devel@edk2.groups.io Cc: ardb@google.com, lersek@redhat.com, mcb30@ipxe.org, Mikhail Krichanov Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mjsbeaton@gmail.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Type: text/plain; charset="UTF-8" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=GNUJpm2S; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Got it. These are the fixes for ArmVirtQemu.dsc. If people have already manually worked round this issue it interferes with this global fix (we had this in one file in Acidanthera code). There don't seem to be many instances of that in the entire EDK-II codebase, however, fortunately. diff --git a/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.c b/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.c index 432112354f..dc49e8eba7 100644 --- a/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.c +++ b/ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.c @@ -71,9 +71,7 @@ PeCoffLoaderRelocateImageExtraAction ( IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext ) { - #if !defined (MDEPKG_NDEBUG) CHAR8 Temp[512]; - #endif if (ImageContext->PdbPointer) { #ifdef __CC_ARM @@ -106,9 +104,7 @@ PeCoffLoaderUnloadImageExtraAction ( IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext ) { - #if !defined (MDEPKG_NDEBUG) CHAR8 Temp[512]; - #endif if (ImageContext->PdbPointer) { #ifdef __CC_ARM diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c index a39896d576..1d3ea61311 100644 --- a/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c +++ b/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c @@ -157,7 +157,6 @@ DescribeExceptionSyndrome ( DEBUG ((DEBUG_ERROR, "\n %a \n", Message)); } -#ifndef MDEPKG_NDEBUG STATIC CONST CHAR8 * BaseName ( @@ -177,8 +176,6 @@ BaseName ( return Str; } -#endif - /** This is the default action to take on an unexpected exception -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112494): https://edk2.groups.io/g/devel/message/112494 Mute This Topic: https://groups.io/mt/103160238/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-