OvmfPkg: Enable CLANG9 tool chain

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1603
1. Apply CLANG9 Linker option.
2. Exclude -mno-mmx -mno-sse compiler option for CLANG9
These two options will cause CLANG Linker crush.

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 4301e7821902135e236ea89b34848a5961529d99..05bb6ae136bcb2afc31bb137b9021d321166ffa3 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -67,7 +67,7 @@
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   INTEL:RELEASE_*_*_CC_FLAGS           = /D MDEPKG_NDEBUG\r
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG\r
-!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
+!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(TOOL_CHAIN_TAG) != "CLANG9"\r
   GCC:*_*_*_CC_FLAGS                   = -mno-mmx -mno-sse\r
 !endif\r
 \r
@@ -81,12 +81,14 @@
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
   XCODE:*_*_*_DLINK_FLAGS =\r
+  CLANGPE: *_*_*_DLINK_FLAGS = /ALIGN:4096\r
 \r
 # Force PE/COFF sections to be aligned at 4KB boundaries to support page level\r
 # protection of DXE_SMM_DRIVER/SMM_CORE modules\r
 [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
   XCODE:*_*_*_DLINK_FLAGS =\r
+  CLANGPE: *_*_*_DLINK_FLAGS = /ALIGN:4096\r
 \r
 ################################################################################\r
 #\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 803fd74ae8e499b5ec1481e1e88f18e49e85ee41..4a75a0332e0eaaadb3130d8100a17fd6f517f48a 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -67,7 +67,7 @@
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   INTEL:RELEASE_*_*_CC_FLAGS           = /D MDEPKG_NDEBUG\r
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG\r
-!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
+!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(TOOL_CHAIN_TAG) != "CLANG9"\r
   GCC:*_*_*_CC_FLAGS                   = -mno-mmx -mno-sse\r
 !endif\r
 !if $(SOURCE_DEBUG_ENABLE) == TRUE\r
@@ -86,12 +86,14 @@
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
   XCODE:*_*_*_DLINK_FLAGS =\r
+  CLANGPE: *_*_*_DLINK_FLAGS = /ALIGN:4096\r
 \r
 # Force PE/COFF sections to be aligned at 4KB boundaries to support page level\r
 # protection of DXE_SMM_DRIVER/SMM_CORE modules\r
 [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
   XCODE:*_*_*_DLINK_FLAGS =\r
+  CLANGPE: *_*_*_DLINK_FLAGS = /ALIGN:4096\r
 \r
 ################################################################################\r
 #\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 5dbd1b793a90e4741838277eda3c630fb3779034..ed54181180f8d0f447ca1ad53f3df6fcf0669bc7 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -67,7 +67,7 @@
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   INTEL:RELEASE_*_*_CC_FLAGS           = /D MDEPKG_NDEBUG\r
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG\r
-!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
+!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(TOOL_CHAIN_TAG) != "CLANG9"\r
   GCC:*_*_*_CC_FLAGS                   = -mno-mmx -mno-sse\r
 !endif\r
 !if $(SOURCE_DEBUG_ENABLE) == TRUE\r
@@ -86,12 +86,14 @@
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
   XCODE:*_*_*_DLINK_FLAGS =\r
+  CLANGPE: *_*_*_DLINK_FLAGS = /ALIGN:4096\r
 \r
 # Force PE/COFF sections to be aligned at 4KB boundaries to support page level\r
 # protection of DXE_SMM_DRIVER/SMM_CORE modules\r
 [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
   XCODE:*_*_*_DLINK_FLAGS =\r
+  CLANGPE: *_*_*_DLINK_FLAGS = /ALIGN:4096\r
 \r
 ################################################################################\r
 #\r