1) Make EfiCpuVersion.c pass ICC and GCC tool-chain

2) Add in CpuIA32Lib_Edk2.inf.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5717 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib_Edk2.inf b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib_Edk2.inf
index 163f8505ec46d60716e4630e9c1acab89c48e4cb..3f40822e6f3e79e90ba5181a81b01fad4ed36e75 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib_Edk2.inf
+++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib_Edk2.inf
@@ -29,11 +29,12 @@ COMPONENT_TYPE  = LIBRARY
 [sources.ia32]\r
   IA32/CpuIA32.c    | MSFT\r
   IA32/CpuIA32.asm  | INTEL\r
+  IA32/CpuIA32.S    | GCC\r
 \r
 [sources.x64]\r
   x64/Cpu.asm       | MSFT\r
   x64/Cpu.asm       | INTEL\r
-  \r
+\r
 [includes.common]\r
   $(EDK_SOURCE)/Foundation/Efi\r
   $(EDK_SOURCE)/Foundation/Efi/Include\r

diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c
index 192469fecf96be464dbed31bed2fdb844a51fd51..7c8cf07093d2d957deb70b969f24d40ba80b1e69 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c
+++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/EfiCpuVersion.c
@@ -59,14 +59,14 @@ Arguments:
     if (Model != NULL) {\r
       *Model = (UINT8) ((Register.RegEax >> 4) & 0xF);\r
       if (TempFamilyId == 0x6 || TempFamilyId == 0xF) {\r
-        *Model |= (Register.RegEax >> 12) & 0xF0;\r
+        *Model = (UINT8) (*Model  | ((Register.RegEax >> 12) & 0xF0));\r
       }\r
     }\r
   \r
     if (FamilyId != NULL) {\r
       *FamilyId = TempFamilyId;\r
       if (TempFamilyId == 0xF) {\r
-        *FamilyId = *FamilyId + (UINT16) ((Register.RegEax >> 20) & 0xFF);\r
+        *FamilyId = (UINT8 ) (*FamilyId + (UINT16) ((Register.RegEax >> 20) & 0xFF));\r
       }\r
     }\r
   } \r