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 b3254061ab2276160bc42613318d259330949035..6d1b8ad72df9c7ea9e23bb0bfa8eb5facb4ff2d4 100755 (executable)
--- a/scripts/layoutrom.py
+++ b/scripts/layoutrom.py
@@ -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(