<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27137">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tianocore: Add more patches<br><br>* Fix building BaseTools in hostgcc v8.1.0+<br>* Fix buidling tianocore on gcc v7.0.0+<br><br>Change-Id: I7e2efea930b27749b1097607ab143ce2f91e79ec<br>Signed-off-by: Patrick Rudolph <siro@das-labor.org><br>---<br>A payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch<br>A payloads/external/tianocore/patches/09_gcc7-Fix-building-with-fpermissive.patch<br>2 files changed, 78 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/27137/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch b/payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch</span><br><span>new file mode 100644</span><br><span>index 0000000..06ddd56</span><br><span>--- /dev/null</span><br><span>+++ b/payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch</span><br><span>@@ -0,0 +1,38 @@</span><br><span style="color: hsl(120, 100%, 40%);">+From b652262ed0dd554c44e7b1bf7134d3458f5edef1 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From: Patrick Rudolph <siro@das-labor.org></span><br><span style="color: hsl(120, 100%, 40%);">+Date: Sun, 17 Jun 2018 08:44:51 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: [PATCH] BaseTools: Fix building with -Werror=stringop-truncation</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Signed-off-by: Patrick Rudolph <siro@das-labor.org></span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+ BaseTools/Source/C/GenVtf/GenVtf.c | 6 +++---</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 file changed, 3 insertions(+), 3 deletions(-)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/BaseTools/Source/C/GenVtf/GenVtf.c b/BaseTools/Source/C/GenVtf/GenVtf.c</span><br><span style="color: hsl(120, 100%, 40%);">+index acc142a6d1..5d77016eba 100644</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/BaseTools/Source/C/GenVtf/GenVtf.c</span><br><span>++++ b/BaseTools/Source/C/GenVtf/GenVtf.c</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -129,9 +129,9 @@ Returns:</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {
</span><br><span style="color: hsl(120, 100%, 40%);">+ Length = strlen(Str);
</span><br><span style="color: hsl(120, 100%, 40%);">+ if (Length < 4) {
</span><br><span style="color: hsl(120, 100%, 40%);">+- strncpy (TemStr + 4 - Length, Str, Length);
</span><br><span style="color: hsl(120, 100%, 40%);">++ memcpy (TemStr + 4 - Length, Str, Length);
</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {
</span><br><span style="color: hsl(120, 100%, 40%);">+- strncpy (TemStr, Str + Length - 4, 4);
</span><br><span style="color: hsl(120, 100%, 40%);">++ memcpy (TemStr, Str + Length - 4, 4);
</span><br><span style="color: hsl(120, 100%, 40%);">+ }
</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ sscanf (
</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -1529,7 +1529,7 @@ Returns:</span><br><span style="color: hsl(120, 100%, 40%);">+ //
</span><br><span style="color: hsl(120, 100%, 40%);">+ FitStartPtr = (FIT_TABLE *) RelativeAddress;
</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+- strncpy ((CHAR8 *) &FitStartPtr->CompAddress, FIT_SIGNATURE, 8); // "_FIT_ "
</span><br><span style="color: hsl(120, 100%, 40%);">++ memcpy ((CHAR8 *) &FitStartPtr->CompAddress, FIT_SIGNATURE, 8); // "_FIT_ "
</span><br><span style="color: hsl(120, 100%, 40%);">+ assert (((VtfInfo->CompSize & 0x00FFFFFF) % 16) == 0);
</span><br><span style="color: hsl(120, 100%, 40%);">+ FitStartPtr->CompSize = (VtfInfo->CompSize & 0x00FFFFFF) / 16;
</span><br><span style="color: hsl(120, 100%, 40%);">+ FitStartPtr->CompVersion = MAKE_VERSION (VtfInfo->MajorVer, VtfInfo->MinorVer);
</span><br><span style="color: hsl(120, 100%, 40%);">+-- </span><br><span style="color: hsl(120, 100%, 40%);">+2.17.0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/payloads/external/tianocore/patches/09_gcc7-Fix-building-with-fpermissive.patch b/payloads/external/tianocore/patches/09_gcc7-Fix-building-with-fpermissive.patch</span><br><span>new file mode 100644</span><br><span>index 0000000..7016759</span><br><span>--- /dev/null</span><br><span>+++ b/payloads/external/tianocore/patches/09_gcc7-Fix-building-with-fpermissive.patch</span><br><span>@@ -0,0 +1,40 @@</span><br><span style="color: hsl(120, 100%, 40%);">+From 5546ab29b2c0c2fc3a963bc71221918dc77b6152 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From: Patrick Rudolph <siro@das-labor.org></span><br><span style="color: hsl(120, 100%, 40%);">+Date: Sun, 17 Jun 2018 08:53:25 +0200</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: [PATCH] gcc7: Fix building with -fpermissive</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Signed-off-by: Patrick Rudolph <siro@das-labor.org></span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+ BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp | 2 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 2 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ 2 files changed, 2 insertions(+), 2 deletions(-)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp</span><br><span style="color: hsl(120, 100%, 40%);">+index 3ca57ed741..4fa066dd9f 100644</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp</span><br><span>++++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -3372,7 +3372,7 @@ CVfrStringDB::GetVarStoreNameFormStringId (</span><br><span style="color: hsl(120, 100%, 40%);">+ UINT8 BlockType;
</span><br><span style="color: hsl(120, 100%, 40%);">+ EFI_HII_STRING_PACKAGE_HDR *PkgHeader;
</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+- if (mStringFileName == '\0' ) {
</span><br><span style="color: hsl(120, 100%, 40%);">++ if (mStringFileName == NULL ) {
</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;
</span><br><span style="color: hsl(120, 100%, 40%);">+ }
</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c</span><br><span style="color: hsl(120, 100%, 40%);">+index 857950118f..de0aa5f7bc 100644</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c</span><br><span>++++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -2181,7 +2181,7 @@ InternalHiiIfrValueAction (</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ StringPtr = ConfigAltResp;
</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+- while (StringPtr != L'\0') {
</span><br><span style="color: hsl(120, 100%, 40%);">++ while (StringPtr != NULL) {
</span><br><span style="color: hsl(120, 100%, 40%);">+ //
</span><br><span style="color: hsl(120, 100%, 40%);">+ // 1. Find <ConfigHdr> GUID=...&NAME=...&PATH=...
</span><br><span style="color: hsl(120, 100%, 40%);">+ //
</span><br><span style="color: hsl(120, 100%, 40%);">+-- </span><br><span style="color: hsl(120, 100%, 40%);">+2.17.0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27137">change 27137</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27137"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7e2efea930b27749b1097607ab143ce2f91e79ec </div>
<div style="display:none"> Gerrit-Change-Number: 27137 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <siro@das-labor.org> </div>