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>
This commit is contained in:
Kevin O'Connor 2014-06-07 15:55:00 -04:00 committed by Gerd Hoffmann
parent b101c1d7d9
commit 0a8c90f101
1 changed files with 2 additions and 8 deletions

View File

@ -175,10 +175,7 @@ def doLayout(sections, config, genreloc):
# 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 @@ def doLayout(sections, config, genreloc):
# 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(