From 601ab358412db7de72cb4bec91c1bfefed8a2115 Mon Sep 17 00:00:00 2001 From: aozima Date: Mon, 23 Oct 2017 20:05:24 +0800 Subject: update gcc linker script: fixed __bss_start align error. --- bsp/beaglebone/beaglebone_ram.lds | 2 +- bsp/imx6sx/cortex-a9/imx6.lds | 2 +- bsp/zynq7000/zynq7000.ld | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bsp/beaglebone/beaglebone_ram.lds b/bsp/beaglebone/beaglebone_ram.lds index 52795e68ba..cf9bf6944d 100644 --- a/bsp/beaglebone/beaglebone_ram.lds +++ b/bsp/beaglebone/beaglebone_ram.lds @@ -67,7 +67,7 @@ SECTIONS __data_end = .; . = ALIGN(4); - __bss_start = __data_end; + __bss_start = .; .bss : { *(.bss) diff --git a/bsp/imx6sx/cortex-a9/imx6.lds b/bsp/imx6sx/cortex-a9/imx6.lds index d8d7480006..e05132025b 100644 --- a/bsp/imx6sx/cortex-a9/imx6.lds +++ b/bsp/imx6sx/cortex-a9/imx6.lds @@ -75,7 +75,7 @@ SECTIONS __data_end = .; . = ALIGN(4); - __bss_start = __data_end; + __bss_start = .; .bss : { *(.bss) diff --git a/bsp/zynq7000/zynq7000.ld b/bsp/zynq7000/zynq7000.ld index ae9b8ea38d..b8f2eb7690 100644 --- a/bsp/zynq7000/zynq7000.ld +++ b/bsp/zynq7000/zynq7000.ld @@ -92,7 +92,7 @@ SECTIONS __data_end = .; . = ALIGN(4); - __bss_start = __data_end; + __bss_start = 0; .bss : { *(.bss) -- cgit v1.3.1 From a1902f2de0b8dda7530c43d4bd1f8674884b5a8d Mon Sep 17 00:00:00 2001 From: aozima Date: Mon, 23 Oct 2017 20:12:28 +0800 Subject: update SrcRemove(): auto detect string or file object. --- tools/building.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/building.py b/tools/building.py index 204fd5037f..f5cbd31617 100644 --- a/tools/building.py +++ b/tools/building.py @@ -695,15 +695,13 @@ def SrcRemove(src, remove): if not src: return - if type(src[0]) == type('str'): - for item in src: + for item in src: + if type(item) == type('str'): if os.path.basename(item) in remove: src.remove(item) - return - - for item in src: - if os.path.basename(item.rstr()) in remove: - src.remove(item) + else: + if os.path.basename(item.rstr()) in remove: + src.remove(item) def GetVersion(): import SCons.cpp -- cgit v1.3.1