From bdcf58033a65581c190a8a826ff9aabd365b0733 Mon Sep 17 00:00:00 2001 From: Jesus Sanchez-Palencia Date: Wed, 22 Jul 2015 09:27:40 -0300 Subject: [PATCH] x86: Group sections for QuarkX1000 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Child sections can be created depending on the CFLAGS used when building Contiki. For instance, if built with -ffunction-sections or -fdata-sections would create one section per function/variable and -Os sometimes split part of .text into one child section. This can also be an issue if we start linking with external libraries that are built in such a way. Since we can't foresee how the port is going to be used, we should make sure it is ready for the cases above. This patch fixes this by correctly grouping child sections into their parent sections. Patch developed while investigating a bug with José Souza (jose.souza@intel.com). --- cpu/x86/quarkX1000.ld | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu/x86/quarkX1000.ld b/cpu/x86/quarkX1000.ld index b4a3afa44..f9ff105c2 100644 --- a/cpu/x86/quarkX1000.ld +++ b/cpu/x86/quarkX1000.ld @@ -42,7 +42,7 @@ SECTIONS { .text ALIGN (4K) : { *(.multiboot) - *(.text) + *(.text*) } .rodata ALIGN (4K) : @@ -52,12 +52,12 @@ SECTIONS { .data ALIGN (4K) : { - *(.data) + *(.data*) } .bss ALIGN (4K) : { *(COMMON) - *(.bss) + *(.bss*) } }