mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2026-02-08 11:54:50 +08:00
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:
@@ -67,7 +67,7 @@ SECTIONS
|
||||
__data_end = .;
|
||||
|
||||
. = ALIGN(4);
|
||||
__bss_start = __data_end;
|
||||
__bss_start = .;
|
||||
.bss :
|
||||
{
|
||||
*(.bss)
|
||||
|
||||
@@ -75,7 +75,7 @@ SECTIONS
|
||||
__data_end = .;
|
||||
|
||||
. = ALIGN(4);
|
||||
__bss_start = __data_end;
|
||||
__bss_start = .;
|
||||
.bss :
|
||||
{
|
||||
*(.bss)
|
||||
|
||||
@@ -92,7 +92,7 @@ SECTIONS
|
||||
__data_end = .;
|
||||
|
||||
. = ALIGN(4);
|
||||
__bss_start = __data_end;
|
||||
__bss_start = 0;
|
||||
.bss :
|
||||
{
|
||||
*(.bss)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user