diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2015-12-02 20:02:58 +0000 |
|---|---|---|
| committer | jljusten <jljusten@Edk2> | 2015-12-02 20:02:58 +0000 |
| commit | 5c13dd09fcedd837cc7df1447b0f093fee2eef2e (patch) | |
| tree | d61ffebace069e1cbdf8a7f8bf28432c4afd4cc1 /EmulatorPkg | |
| parent | dcb2e4bb61931e2dee1739bb76aba315002f0a82 (diff) | |
| download | edk2-5c13dd09fcedd837cc7df1447b0f093fee2eef2e.tar.gz edk2-5c13dd09fcedd837cc7df1447b0f093fee2eef2e.tar.bz2 edk2-5c13dd09fcedd837cc7df1447b0f093fee2eef2e.zip | |
EmulatorPkg: Fix GCC49 build hang in PeiCore
This is a port of 55e96f9c601781b8dc52c40747922f6ca3521f9e / r17902 to
EmulatorPkg:
commit 55e96f9c601781b8dc52c40747922f6ca3521f9e
Author: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Thu Jul 9 08:55:23 2015 +0000
OvmfPkg: Fix GCC49 build hang in PeiCore
Cc: Andrew Fish <afish@apple.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Fixes: https://github.com/tianocore/edk2/issues/24
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19099 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EmulatorPkg')
| -rw-r--r-- | EmulatorPkg/EmulatorPkg.fdf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf index 985a78ee2f..302d81c807 100644 --- a/EmulatorPkg/EmulatorPkg.fdf +++ b/EmulatorPkg/EmulatorPkg.fdf @@ -227,7 +227,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { [Rule.Common.SEC]
FILE SEC = $(NAMED_GUID) {
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi
+ PE32 PE32 Align=Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING ="$(MODULE_NAME)" Optional
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
@@ -235,7 +235,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { [Rule.Common.PEI_CORE]
FILE PEI_CORE = $(NAMED_GUID) {
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi
+ PE32 PE32 Align=Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING ="$(MODULE_NAME)" Optional
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
@@ -243,7 +243,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { [Rule.Common.PEIM]
FILE PEIM = $(NAMED_GUID) {
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi
+ PE32 PE32 Align=Auto $(INF_OUTPUT)/$(MODULE_NAME).efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
|