From: Kevin O'Connor <kevin@koconnor.net>
Date: Tue, 1 Jul 2014 13:50:04 +0000 (-0400)
Subject: vgabios: Fix broken build resulting from e5749978.
X-Git-Tag: rel-1.8.0~115
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a932b908dbc6b9c831d94773b016be8c92086098;p=seabios.git

vgabios: Fix broken build resulting from e5749978.

The e5749978 commit added -fno-merge-constants to the compile flag.
That option changes the names of ".rodata" sections.  Update
vgalayout.lds.S so that the vgabios can continue to build.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---

diff --git a/vgasrc/vgalayout.lds.S b/vgasrc/vgalayout.lds.S
index 08a5f32..533734d 100644
--- a/vgasrc/vgalayout.lds.S
+++ b/vgasrc/vgalayout.lds.S
@@ -13,8 +13,7 @@ SECTIONS
                 KEEP(*(.rom.header))
                 *(.text.*)
                 _rodata = . ;
-                *(.rodata.__func__.*)
-                *(.rodata.str1.1)
+                *(.rodata*)
                 *(.data16.*)
                 }