[SeaBIOS] [Fwd: Build failed in Jenkins: seabios #123]

[Kevin O'Connor]

On Tue, Jul 01, 2014 at 08:18:55AM +0200, Gerd Hoffmann wrote:
>   Hi,
> 
> vgabios build is broken in master ...

Oops.  I've committed the patch below to fix it.

-Kevin


>From a932b908dbc6b9c831d94773b016be8c92086098 Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin at koconnor.net>
Date: Tue, 1 Jul 2014 09:50:04 -0400
Subject: [PATCH] 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 at koconnor.net>
---
 vgasrc/vgalayout.lds.S | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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.*)
                 }
 
-- 
1.9.3