Merge pull request #898 from aozima/pulls

[BSP] Fix the align issue in __bss_start. 
[Tools] Auto-detect the parameter type in SrcRemove.
This commit is contained in:
Bernard Xiong 2017-10-24 12:44:13 +08:00 committed by GitHub
commit 6c0a2e8ffc
4 changed files with 8 additions and 10 deletions

View File

@ -67,7 +67,7 @@ SECTIONS
__data_end = .;
. = ALIGN(4);
__bss_start = __data_end;
__bss_start = .;
.bss :
{
*(.bss)

View File

@ -75,7 +75,7 @@ SECTIONS
__data_end = .;
. = ALIGN(4);
__bss_start = __data_end;
__bss_start = .;
.bss :
{
*(.bss)

View File

@ -92,7 +92,7 @@ SECTIONS
__data_end = .;
. = ALIGN(4);
__bss_start = __data_end;
__bss_start = 0;
.bss :
{
*(.bss)

View File

@ -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