]> xenbits.xensource.com Git - people/aperard/ovmf.git/commitdiff
MdePkg DebugLib: Enable FILE NAME as DEBUG ASSERT for GCC12
authorChun-Yi Lee <jlee@suse.com>
Thu, 12 Sep 2024 06:32:05 +0000 (14:32 +0800)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Fri, 13 Sep 2024 12:45:29 +0000 (12:45 +0000)
Using __FILE_NAME__ is useful for reducing the size of debug image and
it's also good for reproducable builds. The gcc-12 also supported this
macro.

Ref: https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=1a9b3f04c11eb467a8dc504a37dad57a371a0d4c

This patch removed the checking of __clang__ when using __FILE_NAME__.

References: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42579
Signed-off-by: Chun-Yi Lee <jlee@suse.com>
MdePkg/Include/Library/DebugLib.h

index 0db3b78ec86d0a58000baf2775c5eeabe19fe0c8..fc5c83463d4a57d2f031c8d3cc4dc9549225d19f 100644 (file)
@@ -342,13 +342,13 @@ UnitTestDebugAssert (
   #if defined (_ASSERT)\r
     #undef _ASSERT\r
   #endif\r
-  #if defined (__clang__) && defined (__FILE_NAME__)\r
+  #if defined (__FILE_NAME__)\r
 #define _ASSERT(Expression)  UnitTestDebugAssert (__FILE_NAME__, DEBUG_LINE_NUMBER, DEBUG_EXPRESSION_STRING (Expression))\r
   #else\r
 #define _ASSERT(Expression)  UnitTestDebugAssert (__FILE__, DEBUG_LINE_NUMBER, DEBUG_EXPRESSION_STRING (Expression))\r
   #endif\r
 #else\r
-  #if defined (__clang__) && defined (__FILE_NAME__)\r
+  #if defined (__FILE_NAME__)\r
 #define _ASSERT(Expression)  DebugAssert (__FILE_NAME__, DEBUG_LINE_NUMBER, DEBUG_EXPRESSION_STRING (Expression))\r
   #else\r
 #define _ASSERT(Expression)  DebugAssert (__FILE__, DEBUG_LINE_NUMBER, DEBUG_EXPRESSION_STRING (Expression))\r