Google GitGoogle Git
Sign in
qemu/seabios/refs/heads/1.7.5-stable^!/.
commit
0a8c90f1018b4d7f1a45c9509c87299880c71594
[log]
author
Kevin O'Connor <kevin@koconnor.net>
Sat Jun 07 15:55:00 2014 -0400
committer
Gerd Hoffmann <kraxel@redhat.com>
Tue Nov 25 08:24:37 2014 +0100
tree
551cbabcdc37ffbabd6d05b005221608db998145
parent
b101c1d7d90cf3c14d306bb2b50a34b825cf9838 [diff]
build: make buildable with intel compiler.

This is a partial backport of commit e5749978:

build: Keep segmented sections separate until final link step.

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

diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py
index b325406..6d1b8ad 100755
--- a/scripts/layoutrom.py
+++ b/scripts/layoutrom.py

@@ -175,10 +175,7 @@
     # Determine 16bit positions
     li.sections16 = getSectionsCategory(sections, '16')
     textsections = getSectionsPrefix(li.sections16, '.text.')
-    rodatasections = (
-        getSectionsPrefix(li.sections16, '.rodata.str1.1')
-        + getSectionsPrefix(li.sections16, '.rodata.__func__.')
-        + getSectionsPrefix(li.sections16, '.rodata.__PRETTY_FUNCTION__.'))
+    rodatasections = getSectionsPrefix(li.sections16, '.rodata')
     datasections = getSectionsPrefix(li.sections16, '.data16.')
     fixedsections = getSectionsPrefix(li.sections16, '.fixedaddr.')
 
@@ -191,10 +188,7 @@
     # Determine 32seg positions
     li.sections32seg = getSectionsCategory(sections, '32seg')
     textsections = getSectionsPrefix(li.sections32seg, '.text.')
-    rodatasections = (
-        getSectionsPrefix(li.sections32seg, '.rodata.str1.1')
-        + getSectionsPrefix(li.sections32seg, '.rodata.__func__.')
-        + getSectionsPrefix(li.sections32seg, '.rodata.__PRETTY_FUNCTION__.'))
+    rodatasections = getSectionsPrefix(li.sections32seg, '.rodata')
     datasections = getSectionsPrefix(li.sections32seg, '.data32seg.')
 
     li.sec32seg_start, li.sec32seg_align = setSectionsStart(