On Thu, 14 Dec 2023 at 08:28, Mike Beaton <mjsbea...@gmail.com> wrote:
>
> From: Mike Beaton <mjsbea...@gmail.com>
>
> 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 <mjsbea...@gmail.com>
I take it this will trigger a build warning if it is not merged at the
same time as the other change? How about GCC?
> ---
> .../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 (#112504): https://edk2.groups.io/g/devel/message/112504
Mute This Topic: https://groups.io/mt/103166254/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
