OvmfPkg: Disable debugging for UNIXGCC to save space

UNIXGCC builds larger images than GCC44, and can have issues
fitting into the FD image. Therefore, when using UNIXGCC,
debug will be disabled by default.

The README file is updated with instructions for selectively
enabling debug for UNIXGCC.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13569 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 14142189531eed54804ab2361beebf6ae8284622..992de34f8a8c3cd3c1ce26d785de8e5a9b7ab764 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -36,6 +36,7 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
 \r
 [BuildOptions]\r
+  GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   INTEL:RELEASE_*_*_CC_FLAGS           = /D MDEPKG_NDEBUG\r
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 957f394bc31c1528db58b94b36927c3f384db88d..319066c689c8f309e96a529c8aa8ddeda664330c 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -36,6 +36,7 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
 \r
 [BuildOptions]\r
+  GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   INTEL:RELEASE_*_*_CC_FLAGS           = /D MDEPKG_NDEBUG\r
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index b56c551f7479e6fbe348a4b7181a9b7df306e139..636db0560729a1c4c44bce485cac6fa1f7c19ba7 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -36,6 +36,7 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
 \r
 [BuildOptions]\r
+  GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   GCC:RELEASE_*_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
   INTEL:RELEASE_*_*_CC_FLAGS           = /D MDEPKG_NDEBUG\r
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG\r

diff --git a/OvmfPkg/README b/OvmfPkg/README
index 04a658fa316b03a3074b97661ec1b87fc0fd95cf..51041a0551ec696b2cf17cb4b341370b827878d6 100644 (file)
--- a/OvmfPkg/README
+++ b/OvmfPkg/README
@@ -115,3 +115,22 @@ To add network drivers to OVMF:
     -net nic,model=e1000,addr=3 -net nic,model=e1000,addr=4\r
     -net user,restrict=yes -net user,dhcpstart=10.0.2.10\r
 \r
+=== UNIXGCC Debug ===\r
+\r
+If you build with the UNIXGCC toolchain, then debugging will be disabled\r
+due to larger image sizes being produced by the UNIXGCC toolchain. The\r
+first choice recommendation is to use GCC44 or newer instead.\r
+\r
+If you must use UNIXGCC, then you can override the build options for\r
+particular libraries and modules in the .dsc to re-enable debugging\r
+selectively. For example:\r
+  [Components]\r
+  OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf {\r
+    <BuildOptions>\r
+      GCC:*_*_*_CC_FLAGS             = -UMDEPKG_NDEBUG\r
+  }\r
+  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf {\r
+    <BuildOptions>\r
+      GCC:*_*_*_CC_FLAGS             = -UMDEPKG_NDEBUG\r
+  }\r
+\r