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 CD9DE740045 for ; Thu, 14 Dec 2023 07:28:16 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=pUspwyhmAFzF0iRsBdXRqrwDhYq0W4FCEJVNYn3WMIc=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1702538895; v=1; b=U1C480LYMY/vhy4E9KKoVOKDIBu+ayEzf2sBsx0gOI1+tZ7KZ3wloi+yYtAF3wfJR9YKb7P1 5peRLeOW1Cw5jwCOvqqrXAlb10viNn6SfUQsVYKJ5VESbX9NC/wwyGzO5io+7AeEht2v16tkDXU bvN3Swf599BBlOisbM4yu0cE= X-Received: by 127.0.0.2 with SMTP id HbBdYY7687511x6qrjedpQq9; Wed, 13 Dec 2023 23:28:15 -0800 X-Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web10.16929.1702538894754910231 for ; Wed, 13 Dec 2023 23:28:15 -0800 X-Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-40c2c65e6aaso81126605e9.2 for ; Wed, 13 Dec 2023 23:28:14 -0800 (PST) X-Gm-Message-State: VxSm9ZIkmYtexH6VRkHmWFkHx7686176AA= X-Google-Smtp-Source: AGHT+IGys9ckhbA8sqyAnasMoZ+OA3JFrqcEbBJPe8buWuawhii6HHXDuNXhQDqTxBcj0XVUW7S5Wg== X-Received: by 2002:a05:600c:3589:b0:40c:35b3:b7a5 with SMTP id p9-20020a05600c358900b0040c35b3b7a5mr4618724wmq.11.1702538892436; Wed, 13 Dec 2023 23:28:12 -0800 (PST) X-Received: from mikes-OptiPlex-3070.lan ([209.240.0.204]) by smtp.gmail.com with ESMTPSA id g20-20020a05600c4ed400b0040c31bb66dcsm23140533wmq.20.2023.12.13.23.28.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 23:28:12 -0800 (PST) From: "Mike Beaton" To: devel@edk2.groups.io Cc: ardb@google.com, lersek@redhat.com, mcb30@ipxe.org, mikhailkrichanov@gmail.com, Mike Beaton Subject: [edk2-devel] [PATCH V4 2/2] ArmPkg: Remove manual exclusion of debug vars when MDEPKG_NDEBUG is not defined Date: Thu, 14 Dec 2023 07:27:45 +0000 Message-Id: <20231214072743.6432-2-mjsbeaton@gmail.com> In-Reply-To: <20231214072743.6432-1-mjsbeaton@gmail.com> References: <20231214072743.6432-1-mjsbeaton@gmail.com> MIME-Version: 1.0 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-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=U1C480LY; 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 From: Mike Beaton This is no longer required since the revised DEBUG macro automatically compiles away unused var accesses when MDEPKG_NDEBUG is defined; keeping these lines is incompatible with the updated DEBUG macro, as there has to be a variable, access to which to discard. Signed-off-by: Mike Beaton --- .../DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.c | 4 ---- .../AArch64/DefaultExceptionHandler.c | 3 --- 2 files changed, 7 deletions(-) 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 -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112501): https://edk2.groups.io/g/devel/message/112501 Mute This Topic: https://groups.io/mt/103166254/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-