From: Scott Duplichan <scott@notabs.org>
Date: Fri, 10 Apr 2015 02:05:48 +0000 (+0000)
Subject: CorebootModulePkg: Fix build failure with 32-bit NOOPT target
X-Git-Tag: edk2-stable201903~10071
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5451fff49c904ea781cfbaef2a7cae3bd697c5b3;hp=e56e18704493062ef9dc3f6df25a4c02825eb611;p=mirror_edk2.git

CorebootModulePkg: Fix build failure with 32-bit NOOPT target

Fix build failure with 32-bit NOOPT target by replacing direct shift
of 64-bit integer with a function call. Otherwise Microsoft tool chains
will generate a call to function __allshl and fail to link.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Scott Duplichan <scott@notabs.org>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17142 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/CorebootModulePkg/Library/CbParseLib/CbParseLib.c b/CorebootModulePkg/Library/CbParseLib/CbParseLib.c
index 5535fdcdd5..4dc74abb13 100644
--- a/CorebootModulePkg/Library/CbParseLib/CbParseLib.c
+++ b/CorebootModulePkg/Library/CbParseLib/CbParseLib.c
@@ -28,7 +28,7 @@
 
 static UINT64 cb_unpack64(struct cbuint64 val)
 {
-  return (((UINT64) val.hi) << 32) | val.lo;
+  return LShiftU64 (val.hi, 32) | val.lo;
 }
 
 static const char *cb_mb_vendor_string(const struct cb_mainboard *cbm)