bump pkgver

4 files changed, 8 insertions, 299 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd751a454d8a..38ba588a9dd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ovmf-svn
 	pkgdesc = UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - SVN Version
-	pkgver = 16039
+	pkgver = 16056
 	pkgrel = 1
 	url = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF
 	install = ovmf.install
@@ -10,9 +10,10 @@ pkgbase = ovmf-svn
 	makedepends = subversion
 	makedepends = python2
 	makedepends = iasl
-	provides = ovmf=16039
-	provides = ovmf-tianocore-edk2=16039
-	provides = ovmf-tianocore-edk2-svn=16039
+	makedepends = nasm
+	provides = ovmf=16056
+	provides = ovmf-tianocore-edk2=16056
+	provides = ovmf-tianocore-edk2-svn=16056
 	conflicts = ovmf
 	conflicts = ovmf-tianocore-edk2
 	conflicts = ovmf-tianocore-edk2-svn
@@ -21,8 +22,6 @@ pkgbase = ovmf-svn
 	options = docs
 	options = !makeflags
 	source = http://www.openssl.org/source/openssl-0.9.8zb.tar.gz
-	source = edk2-basetools-add-gcc4.9-support.patch
-	source = edk2-ovmfpkg-add-gcc4.9-support.patch
 	source = tianocore-edk2-svn_BaseTools::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/BaseTools
 	source = tianocore-edk2-svn_MdePkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/MdePkg
 	source = tianocore-edk2-svn_MdeModulePkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/MdeModulePkg
@@ -37,8 +36,6 @@ pkgbase = ovmf-svn
 	source = tianocore-edk2-svn_FatBinPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/FatBinPkg
 	source = tianocore-edk2-svn_OvmfPkg::svn+https://svn.code.sf.net/p/edk2/code/trunk/edk2/OvmfPkg
 	sha1sums = 4f0079d4d924ab618d5f846cb91f413184bf8dea
-	sha1sums = fd92560dbc2f5c8c7bd36def1f836441e7529b30
-	sha1sums = 662d4136ddf4dbc051242b84f8a9ae956fae61b1
 	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 0e5f88541473..c0f9206fe01e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,14 +24,14 @@ _OPENSSL_VERSION="0.9.8zb"
 _pkgname="ovmf"
 pkgname="${_pkgname}-svn"
 
-pkgver=16039
+pkgver=16056
 pkgrel=1
 pkgdesc="UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - SVN Version"
 url="http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF"
 arch=('x86_64' 'i686')
 license=('BSD')
 
-makedepends=('subversion' 'python2' 'iasl')
+makedepends=('subversion' 'python2' 'iasl' 'nasm')
 
 options=('!strip' 'docs' '!makeflags')
 
@@ -40,9 +40,7 @@ provides=("ovmf=${pkgver}" "ovmf-tianocore-edk2=${pkgver}" "ovmf-tianocore-edk2-
 
 install="${_pkgname}.install"
 
-source=("http://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz"
-        'edk2-basetools-add-gcc4.9-support.patch'
-        'edk2-ovmfpkg-add-gcc4.9-support.patch')
+source=("http://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz")
 
 for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do
 	source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}")
@@ -53,8 +51,6 @@ for _DIR_ in PcAtChipsetPkg UefiCpuPkg OptionRomPkg CryptoPkg SecurityPkg ShellP
 done
 
 sha1sums=('4f0079d4d924ab618d5f846cb91f413184bf8dea'
-          'fd92560dbc2f5c8c7bd36def1f836441e7529b30'
-          '662d4136ddf4dbc051242b84f8a9ae956fae61b1'
           'SKIP'
           'SKIP'
           'SKIP'
@@ -119,10 +115,6 @@ _prepare_tianocore_sources() {
 	mkdir -p "${_UDK_DIR}/Conf/"
 	mkdir -p "${_UDK_DIR}/Build/"
 	
-	msg "Fix GenFw: ERROR 3000: Invalid, Unsupported section alignment"
-	patch -Np1 -i "${srcdir}/edk2-basetools-add-gcc4.9-support.patch" || true
-	patch -Np1 -i "${srcdir}/edk2-ovmfpkg-add-gcc4.9-support.patch" || true
-	
 	msg "Use python2 for UDK BaseTools"
 	sed 's|python |python2 |g' -i "${EDK_TOOLS_PATH}/BinWrappers/PosixLike"/* || true
 	sed 's|python |python2 |g' -i "${EDK_TOOLS_PATH}/Tests/GNUmakefile"
diff --git a/edk2-basetools-add-gcc4.9-support.patch b/edk2-basetools-add-gcc4.9-support.patch
deleted file mode 100644
index 1a0535a9e758..000000000000
--- a/edk2-basetools-add-gcc4.9-support.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-commit c6fc66d237880efa556a93fd97a3701ffb04432b
-Author: Eric Dong <eric.dong@intel.com>
-Date:   Mon Jul 21 09:59:06 2014 +0000
-
-    Refine code to follow good coding style.
-    
-    Contributed-under: TianoCore Contribution Agreement 1.0
-    Signed-off-by: Eric Dong <eric.dong@intel.com>
-    
-    git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15666 6f19259b-4bc3-4df7-8a09-765794883524
-
-diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index f99ddf6..f9e1e6c 100644
---- a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -162,6 +162,9 @@ DEFINE GCC47_X64_PREFIX        = /usr/bin/
- DEFINE GCC48_IA32_PREFIX       = /usr/bin/

- DEFINE GCC48_X64_PREFIX        = /usr/bin/

- 

-+DEFINE GCC49_IA32_PREFIX       = /usr/bin/

-+DEFINE GCC49_X64_PREFIX        = /usr/bin/

-+

- DEFINE UNIX_IASL_BIN           = ENV(IASL_PREFIX)iasl

- DEFINE WIN_ASL_BIN_DIR         = C:\ASL

- DEFINE WIN_IASL_BIN            = DEF(WIN_ASL_BIN_DIR)\iasl.exe

-@@ -307,6 +310,12 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
- #                             Required to build platforms or ACPI tables:

- #                               Intel(r) ACPI Compiler v20101013 from

- #                               http://www.acpica.org/downloads/previous_releases.php

-+#   GCC49       -Linux-  Requires:

-+#                             GCC 4.9

-+#                        Optional:

-+#                             Required to build platforms or ACPI tables:

-+#                               Intel(r) ACPI Compiler v20101013 from

-+#                               http://www.acpica.org/downloads/previous_releases.php

- #   ELFGCC      -Linux-  Requires:

- #                             GCC(this tool chain uses whatever version of gcc and binutils that is installed in /usr/bin)

- #                        Optional:

-@@ -3216,6 +3225,22 @@ DEFINE GCC48_AARCH64_DLINK_FLAGS     = DEF(GCC_ARM_AARCH64_DLINK_COMMON)
- DEFINE GCC48_ARM_ASLDLINK_FLAGS      = DEF(GCC47_ARM_ASLDLINK_FLAGS)

- DEFINE GCC48_AARCH64_ASLDLINK_FLAGS  = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)

- 

-+DEFINE GCC49_IA32_CC_FLAGS           = DEF(GCC48_IA32_CC_FLAGS)

-+DEFINE GCC49_X64_CC_FLAGS            = DEF(GCC48_X64_CC_FLAGS)

-+DEFINE GCC49_IA32_X64_DLINK_COMMON   = -nostdlib -n -q --gc-sections --script=$(EDK_TOOLS_PATH)/Scripts/gcc4.9-ld-script

-+DEFINE GCC49_IA32_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_COMMON) --entry ReferenceAcpiTable -u ReferenceAcpiTable

-+DEFINE GCC49_IA32_X64_DLINK_FLAGS    = DEF(GCC49_IA32_X64_DLINK_COMMON) --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

-+DEFINE GCC49_X64_DLINK_FLAGS         = DEF(GCC49_IA32_X64_DLINK_FLAGS)  -melf_x86_64 --oformat=elf64-x86-64

-+DEFINE GCC49_ASM_FLAGS               = DEF(GCC48_ASM_FLAGS)

-+DEFINE GCC49_ARM_ASM_FLAGS           = DEF(GCC48_ARM_ASM_FLAGS)

-+DEFINE GCC49_AARCH64_ASM_FLAGS       = DEF(GCC48_AARCH64_ASM_FLAGS)

-+DEFINE GCC49_ARM_CC_FLAGS            = DEF(GCC48_ARM_CC_FLAGS)

-+DEFINE GCC49_AARCH64_CC_FLAGS        = DEF(GCC48_AARCH64_CC_FLAGS)

-+DEFINE GCC49_ARM_DLINK_FLAGS         = DEF(GCC48_ARM_DLINK_FLAGS)

-+DEFINE GCC49_AARCH64_DLINK_FLAGS     = DEF(GCC_ARM_AARCH64_DLINK_COMMON)

-+DEFINE GCC49_ARM_ASLDLINK_FLAGS      = DEF(GCC48_ARM_ASLDLINK_FLAGS)

-+DEFINE GCC49_AARCH64_ASLDLINK_FLAGS  = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)

-+

- ####################################################################################

- #

- # Unix GCC And Intel Linux ACPI Compiler

-@@ -3769,6 +3794,126 @@ RELEASE_GCC48_AARCH64_CC_FLAGS   = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
- 

- ####################################################################################

- #

-+# GCC 4.9 - This configuration is used to compile under Linux to produce

-+#           PE/COFF binaries using GCC 4.9.

-+#

-+####################################################################################

-+*_GCC49_*_*_FAMILY               = GCC

-+

-+*_GCC49_*_MAKE_PATH                    = make

-+*_GCC49_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)

-+

-+*_GCC49_*_PP_FLAGS                     = DEF(GCC_PP_FLAGS)

-+*_GCC49_*_ASLPP_FLAGS                  = DEF(GCC_ASLPP_FLAGS)

-+*_GCC49_*_ASLCC_FLAGS                  = DEF(GCC_ASLCC_FLAGS)

-+*_GCC49_*_VFRPP_FLAGS                  = DEF(GCC_VFRPP_FLAGS)

-+*_GCC49_*_APP_FLAGS                    =

-+*_GCC49_*_ASL_FLAGS                    = DEF(IASL_FLAGS)

-+*_GCC49_*_ASL_OUTFLAGS                 = DEF(IASL_OUTFLAGS)

-+

-+##################

-+# GCC49 IA32 definitions

-+##################

-+*_GCC49_IA32_OBJCOPY_PATH         = DEF(GCC49_IA32_PREFIX)objcopy

-+*_GCC49_IA32_CC_PATH              = DEF(GCC49_IA32_PREFIX)gcc

-+*_GCC49_IA32_SLINK_PATH           = DEF(GCC49_IA32_PREFIX)ar

-+*_GCC49_IA32_DLINK_PATH           = DEF(GCC49_IA32_PREFIX)ld

-+*_GCC49_IA32_ASLDLINK_PATH        = DEF(GCC49_IA32_PREFIX)ld

-+*_GCC49_IA32_ASM_PATH             = DEF(GCC49_IA32_PREFIX)gcc

-+*_GCC49_IA32_PP_PATH              = DEF(GCC49_IA32_PREFIX)gcc

-+*_GCC49_IA32_VFRPP_PATH           = DEF(GCC49_IA32_PREFIX)gcc

-+*_GCC49_IA32_ASLCC_PATH           = DEF(GCC49_IA32_PREFIX)gcc

-+*_GCC49_IA32_ASLPP_PATH           = DEF(GCC49_IA32_PREFIX)gcc

-+*_GCC49_IA32_RC_PATH              = DEF(GCC49_IA32_PREFIX)objcopy

-+

-+*_GCC49_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32

-+*_GCC49_IA32_ASLDLINK_FLAGS       = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -m elf_i386

-+*_GCC49_IA32_ASM_FLAGS            = DEF(GCC49_ASM_FLAGS) -m32 -march=i386

-+*_GCC49_IA32_CC_FLAGS             = DEF(GCC49_IA32_CC_FLAGS) -Os

-+*_GCC49_IA32_DLINK_FLAGS          = DEF(GCC49_IA32_X64_DLINK_FLAGS) -m elf_i386 --oformat=elf32-i386

-+*_GCC49_IA32_RC_FLAGS             = DEF(GCC_IA32_RC_FLAGS)

-+*_GCC49_IA32_OBJCOPY_FLAGS        = 

-+

-+##################

-+# GCC49 X64 definitions

-+##################

-+*_GCC49_X64_OBJCOPY_PATH         = DEF(GCC49_X64_PREFIX)objcopy

-+*_GCC49_X64_CC_PATH              = DEF(GCC49_X64_PREFIX)gcc

-+*_GCC49_X64_SLINK_PATH           = DEF(GCC49_X64_PREFIX)ar

-+*_GCC49_X64_DLINK_PATH           = DEF(GCC49_X64_PREFIX)ld

-+*_GCC49_X64_ASLDLINK_PATH        = DEF(GCC49_X64_PREFIX)ld

-+*_GCC49_X64_ASM_PATH             = DEF(GCC49_X64_PREFIX)gcc

-+*_GCC49_X64_PP_PATH              = DEF(GCC49_X64_PREFIX)gcc

-+*_GCC49_X64_VFRPP_PATH           = DEF(GCC49_X64_PREFIX)gcc

-+*_GCC49_X64_ASLCC_PATH           = DEF(GCC49_X64_PREFIX)gcc

-+*_GCC49_X64_ASLPP_PATH           = DEF(GCC49_X64_PREFIX)gcc

-+*_GCC49_X64_RC_PATH              = DEF(GCC49_X64_PREFIX)objcopy

-+

-+*_GCC49_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64

-+*_GCC49_X64_ASLDLINK_FLAGS       = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64

-+*_GCC49_X64_ASM_FLAGS            = DEF(GCC49_ASM_FLAGS) -m64

-+*_GCC49_X64_CC_FLAGS             = DEF(GCC49_X64_CC_FLAGS)

-+*_GCC49_X64_DLINK_FLAGS          = DEF(GCC49_X64_DLINK_FLAGS)

-+*_GCC49_X64_RC_FLAGS             = DEF(GCC_X64_RC_FLAGS)

-+*_GCC49_X64_OBJCOPY_FLAGS        = 

-+

-+##################

-+# GCC49 ARM definitions

-+##################

-+*_GCC49_ARM_CC_PATH              = ENV(GCC49_ARM_PREFIX)gcc

-+*_GCC49_ARM_SLINK_PATH           = ENV(GCC49_ARM_PREFIX)ar

-+*_GCC49_ARM_DLINK_PATH           = ENV(GCC49_ARM_PREFIX)ld

-+*_GCC49_ARM_ASLDLINK_PATH        = ENV(GCC49_ARM_PREFIX)ld

-+*_GCC49_ARM_ASM_PATH             = ENV(GCC49_ARM_PREFIX)gcc

-+*_GCC49_ARM_PP_PATH              = ENV(GCC49_ARM_PREFIX)gcc

-+*_GCC49_ARM_VFRPP_PATH           = ENV(GCC49_ARM_PREFIX)gcc

-+*_GCC49_ARM_ASLCC_PATH           = ENV(GCC49_ARM_PREFIX)gcc

-+*_GCC49_ARM_ASLPP_PATH           = ENV(GCC49_ARM_PREFIX)gcc

-+*_GCC49_ARM_RC_PATH              = ENV(GCC49_ARM_PREFIX)objcopy

-+

-+*_GCC49_ARM_ARCHCC_FLAGS         = -mthumb

-+*_GCC49_ARM_PLATFORM_FLAGS       = -march=armv7-a

-+

-+*_GCC49_ARM_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)

-+*_GCC49_ARM_ASLDLINK_FLAGS       = DEF(GCC49_ARM_ASLDLINK_FLAGS)

-+*_GCC49_ARM_ASM_FLAGS            = DEF(GCC49_ARM_ASM_FLAGS)

-+*_GCC49_ARM_DLINK_FLAGS          = DEF(GCC49_ARM_DLINK_FLAGS)

-+*_GCC49_ARM_PLATFORM_FLAGS       = -march=armv7-a

-+*_GCC49_ARM_PP_FLAGS             = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)

-+*_GCC49_ARM_RC_FLAGS             = DEF(GCC_ARM_RC_FLAGS)

-+*_GCC49_ARM_VFRPP_FLAGS          = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)

-+

-+  DEBUG_GCC49_ARM_CC_FLAGS       = DEF(GCC49_ARM_CC_FLAGS) -O0

-+RELEASE_GCC49_ARM_CC_FLAGS       = DEF(GCC49_ARM_CC_FLAGS) -Wno-unused-but-set-variable

-+

-+##################

-+# GCC49 AARCH64 definitions

-+##################

-+*_GCC49_AARCH64_CC_PATH          = ENV(GCC49_AARCH64_PREFIX)gcc

-+*_GCC49_AARCH64_SLINK_PATH       = ENV(GCC49_AARCH64_PREFIX)ar

-+*_GCC49_AARCH64_DLINK_PATH       = ENV(GCC49_AARCH64_PREFIX)ld

-+*_GCC49_AARCH64_ASLDLINK_PATH    = ENV(GCC49_AARCH64_PREFIX)ld

-+*_GCC49_AARCH64_ASM_PATH         = ENV(GCC49_AARCH64_PREFIX)gcc

-+*_GCC49_AARCH64_PP_PATH          = ENV(GCC49_AARCH64_PREFIX)gcc

-+*_GCC49_AARCH64_VFRPP_PATH       = ENV(GCC49_AARCH64_PREFIX)gcc

-+*_GCC49_AARCH64_ASLCC_PATH       = ENV(GCC49_AARCH64_PREFIX)gcc

-+*_GCC49_AARCH64_ASLPP_PATH       = ENV(GCC49_AARCH64_PREFIX)gcc

-+*_GCC49_AARCH64_RC_PATH          = ENV(GCC49_AARCH64_PREFIX)objcopy

-+

-+*_GCC49_AARCH64_ASLCC_FLAGS      = DEF(GCC_ASLCC_FLAGS)

-+*_GCC49_AARCH64_ASLDLINK_FLAGS   = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)

-+*_GCC49_AARCH64_ASM_FLAGS        = DEF(GCC49_AARCH64_ASM_FLAGS)

-+*_GCC49_AARCH64_DLINK_FLAGS      = DEF(GCC49_AARCH64_DLINK_FLAGS)

-+*_GCC49_AARCH64_PLATFORM_FLAGS   =

-+*_GCC49_AARCH64_PP_FLAGS         = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)

-+*_GCC49_AARCH64_RC_FLAGS         = DEF(GCC_AARCH64_RC_FLAGS)

-+*_GCC49_AARCH64_VFRPP_FLAGS      = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)

-+

-+  DEBUG_GCC49_AARCH64_CC_FLAGS   = DEF(GCC49_AARCH64_CC_FLAGS) -O0

-+RELEASE_GCC49_AARCH64_CC_FLAGS   = DEF(GCC49_AARCH64_CC_FLAGS) -Wno-unused-but-set-variable

-+

-+####################################################################################

-+#

- # Cygwin GCC And Intel ACPI Compiler

- #

- ####################################################################################

-diff --git a/BaseTools/Scripts/gcc4.9-ld-script b/BaseTools/Scripts/gcc4.9-ld-script
-new file mode 100644
-index 0000000..b692328
---- /dev/null
-+++ b/BaseTools/Scripts/gcc4.9-ld-script
-@@ -0,0 +1,44 @@
-+/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */

-+SECTIONS

-+{

-+  /* . = 0 + SIZEOF_HEADERS; */

-+  . = 0x280;

-+  .text ALIGN(0x20) :

-+  {

-+    *(.text .stub .text.* .gnu.linkonce.t.*)

-+    . = ALIGN(0x20);

-+  } =0x90909090

-+  .data ALIGN(0x40) :

-+  {

-+    *(

-+      .rodata .rodata.* .gnu.linkonce.r.*

-+      .data .data.* .gnu.linkonce.d.*

-+      .bss .bss.*

-+      *COM*

-+    )

-+    . = ALIGN(0x20);

-+  }

-+  .eh_frame ALIGN(0x20) :

-+  {

-+    KEEP (*(.eh_frame))

-+  }

-+  .got ALIGN(0x20) :

-+  {

-+    *(.got .got.*)

-+    . = ALIGN(0x20);

-+  }

-+  .rela ALIGN(0x20) :

-+  {

-+    *(.rela .rela.*)

-+  }

-+  /DISCARD/ : {

-+    *(.note.GNU-stack) *(.gnu_debuglink)

-+    *(.interp)

-+    *(.dynsym)

-+    *(.dynstr)

-+    *(.dynamic)

-+    *(.hash)

-+    *(.comment)

-+  }

-+}

-+

diff --git a/edk2-ovmfpkg-add-gcc4.9-support.patch b/edk2-ovmfpkg-add-gcc4.9-support.patch
deleted file mode 100644
index d38ffb9d6083..000000000000
--- a/edk2-ovmfpkg-add-gcc4.9-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 674f3849d6e49ee515cdd05d54174b19536eda60
-Author: Jordan Justen <jordan.l.justen@intel.com>
-Date:   Mon Jul 21 12:02:22 2014 -0700
-
-    BaseTools: Add GCC49 toolchain; align data sections to 0x40
-    
-    GCC 4.9 may use 64-byte (0x40) alignment for data sections.
-    
-    Therefore we use a different link script for GCC 4.9. The only
-    difference from the gcc4.4-ld-script is the alignment for data
-    sections.
-    
-    When using the GCC48 toolchain with GCC 4.9, this error would be
-    encountered by GenFw:
-    > GenFw: ERROR 3000: Invalid
-    >   Unsupported section alignment.
-    
-    Contributed-under: TianoCore Contribution Agreement 1.0
-    Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
-    Cc: edk2-buildtools-devel@lists.sourceforge.net
-    Cc: Alain Kalker <a.c.kalker@gmail.com>
-    Cc: Keshav Amburay <the.ridikulus.rat@gmail.com>
-    Cc: "Mendyke, DanielX" <danielx.mendyke@intel.com>
-
-diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
-index 5bfee72..c3cc72e 100755
---- a/OvmfPkg/build.sh
-+++ b/OvmfPkg/build.sh
-@@ -85,9 +85,12 @@ case `uname` in
-       4.7.*)
-         TARGET_TOOLS=GCC47
-         ;;
--      4.[8-9].*)
-+      4.8.*)
-         TARGET_TOOLS=GCC48
-         ;;
-+      4.9.*|4.1[0-9].*)
-+        TARGET_TOOLS=GCC49
-+        ;;
-       *)
-         TARGET_TOOLS=GCC44
-         ;;