aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2018-08-20 14:17:41 +0200
committerAlexander Graf <agraf@suse.de>2018-08-20 14:17:43 +0200
commit6331cb21650f097d2310de432647b2fbe66935c3 (patch)
treee1b23793e6e1f52069e87cb79e219f11b28d900a /arch
parent07240da293379cc3e50fef1615b14225d7d583af (diff)
downloadu-boot-6331cb21650f097d2310de432647b2fbe66935c3.zip
u-boot-6331cb21650f097d2310de432647b2fbe66935c3.tar.gz
u-boot-6331cb21650f097d2310de432647b2fbe66935c3.tar.bz2
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/cpu/u-boot-64.lds2
-rw-r--r--arch/x86/cpu/u-boot.lds2
-rw-r--r--arch/x86/lib/elf_ia32_efi.lds2
-rw-r--r--arch/x86/lib/elf_x86_64_efi.lds2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/cpu/u-boot-64.lds b/arch/x86/cpu/u-boot-64.lds
index 862aa2d..98c7f8e 100644
--- 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 a1cc19c..a283c29 100644
--- 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 983fabb..aad61e7 100644
--- 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 7cad70a..b436429 100644
--- 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)