x86: Include bss subsections in linker script

When we build with -fdata-sections we may end up with bss subsections. Our
linker script explicitly lists only a single consecutive bss section though.

Adapt the statement to also include subsections.

This fixes booting efi-x86_app_defconfig.

Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/arch/x86/cpu/u-boot-64.lds b/arch/x86/cpu/u-boot-64.lds
index 862aa2d35e19d77155ba63035fd4689cdbb94630..98c7f8e9c53e9d78bea1e193fef10de59e1b85a6 100644 (file)
--- a/arch/x86/cpu/u-boot-64.lds
+++ b/arch/x86/cpu/u-boot-64.lds
@@ -95,7 +95,7 @@ SECTIONS
 
        .bss __rel_dyn_start (OVERLAY) : {
                __bss_start = .;
-               *(.bss)
+               *(.bss*)
                *(COM*)
                . = ALIGN(4);
                __bss_end = .;

diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds
index a1cc19ce4cb950efc3ac1dc11554deac66d37f57..a283c290eefd00fdc37ee166396b01eb0011d006 100644 (file)
--- a/arch/x86/cpu/u-boot.lds
+++ b/arch/x86/cpu/u-boot.lds
@@ -94,7 +94,7 @@ SECTIONS
 
        .bss __rel_dyn_start (OVERLAY) : {
                __bss_start = .;
-               *(.bss)
+               *(.bss*)
                *(COM*)
                . = ALIGN(4);
                __bss_end = .;

diff --git a/arch/x86/lib/elf_ia32_efi.lds b/arch/x86/lib/elf_ia32_efi.lds
index 983fabbc4d7ed0c24d608a0e6895313a7ab63fe6..aad61e7f817c5481639de520e7f20588107f0c06 100644 (file)
--- a/arch/x86/lib/elf_ia32_efi.lds
+++ b/arch/x86/lib/elf_ia32_efi.lds
@@ -46,7 +46,7 @@ SECTIONS
                *(.sbss)
                *(.scommon)
                *(.dynbss)
-               *(.bss)
+               *(.bss*)
                *(COMMON)
 
                /* U-Boot lists and device tree */

diff --git a/arch/x86/lib/elf_x86_64_efi.lds b/arch/x86/lib/elf_x86_64_efi.lds
index 7cad70a2e479208d16080f5cd9c254fa8ad0c79f..b436429b33e6d12fdacf70c233b15947611df866 100644 (file)
--- a/arch/x86/lib/elf_x86_64_efi.lds
+++ b/arch/x86/lib/elf_x86_64_efi.lds
@@ -44,7 +44,7 @@ SECTIONS
                *(.sbss)
                *(.scommon)
                *(.dynbss)
-               *(.bss)
+               *(.bss*)
                *(COMMON)
                *(.rel.local)