From: Hao Wu <hao.a.wu@intel.com>
Date: Fri, 26 Feb 2016 08:43:02 +0000 (+0800)
Subject: UefiCpuPkg/Cpuid: Fix GCC build error
X-Git-Tag: edk2-stable201903~7775
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=d2ba6f41e2f8cbc8dffee8bddaebbbd6f3a3b9ab

UefiCpuPkg/Cpuid: Fix GCC build error

define PRINT_BIT_FIELD(Variable, FieldName) \
  Print (L"%5a%42a: %x\n", #Variable, #FieldName, \
  ##Variable.Bits.##FieldName);

The above definition in UefiCpuPkg/Application/Cpuid/Cpuid.c
will cause GCC build error.

Fix it with:

define PRINT_BIT_FIELD(Variable, FieldName) \
  Print (L"%5a%42a: %x\n", #Variable, #FieldName, \
  Variable.Bits.FieldName);

The '.' has its origin meaning as a member operator in the define
statement. Thus, the token-pasting operator '##' is not necessary here.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
---

diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/Cpuid/Cpuid.c
index f82e43f563..366c3ca205 100644
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.c
+++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c
@@ -21,7 +21,7 @@
 /// Macro used to display the value of a bit field in a register returned by CPUID.
 ///
 #define PRINT_BIT_FIELD(Variable, FieldName) \
-  Print (L"%5a%42a: %x\n", #Variable, #FieldName, ##Variable.Bits.##FieldName);
+  Print (L"%5a%42a: %x\n", #Variable, #FieldName, Variable.Bits.FieldName);
 
 ///
 /// Macro used to display the value of a register returned by CPUID.