Merge pull request #127 from aozima/pulls

update linker script and SConstruct.
2013-07-11 15:53:44 -07:00 · 2013-07-11 15:53:44 -07:00 · a5a36d3fbf
commit a5a36d3fbf
parent 51532ae425 8711a0c986
46 changed files with 665 additions and 621 deletions
--- a/bsp/at91sam9260/SConstruct
+++ b/bsp/at91sam9260/SConstruct
@ -34,8 +34,5 @@ if GetDepend('RT_USING_RTGUI'):
 # libc testsuite 
 objs = objs + SConscript(RTT_ROOT + '/examples/libc/SConscript', variant_dir='build/examples/libc', duplicate=0)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/at91sam9260/at91sam9260_ram.ld
+++ b/bsp/at91sam9260/at91sam9260_ram.ld
@ -23,6 +23,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);   

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        /* section information for modules */
        . = ALIGN(4);
        __rtmsymtab_start = .;
--- a/bsp/avr32uc3b0/SConstruct
+++ b/bsp/avr32uc3b0/SConstruct
@ -28,8 +28,5 @@ objs = PrepareBuilding(env, RTT_ROOT)
 # AVR32 software framework building script
 objs = objs + SConscript(RTT_ROOT + '/bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript', variant_dir='bsp/SOFTWARE_FRAMEWORK', duplicate=0)
 
-# build program
-env.Program(TARGET, objs)
- 
-# end building
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/dev3210/SConstruct
+++ b/bsp/dev3210/SConstruct
@ -25,8 +25,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/efm32/SConstruct
+++ b/bsp/efm32/SConstruct
@ -31,8 +31,5 @@ objs = objs + SConscript(RTT_ROOT + '/bsp/efm32/EFM32GG_DK3750/SConscript', vari
 objs = objs + SConscript(RTT_ROOT + '/bsp/efm32/graphics/SConscript', variant_dir='build/graphics', duplicate=0)
 objs = objs + SConscript(RTT_ROOT + '/bsp/efm32/Libraries/SConscript', variant_dir='build/Libraries', duplicate=0)

-# build program
-env.Program(TARGET, objs)
-
-# end building
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/efm32/efm32g_rom.ld
+++ b/bsp/efm32/efm32g_rom.ld
@ -88,6 +88,13 @@ SECTIONS
        __vsymtab_start = .;
        KEEP(*(VSymTab))
        __vsymtab_end = .;
+
+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
    } > FLASH = 0

    .ARM.extab :
--- a/bsp/jz47xx/SConscript
+++ b/bsp/jz47xx/SConscript
@ -6,7 +6,7 @@ src_bsp   = ['application.c', 'startup.c', 'board.c']
 src_drv   = ['uart.c']

 src	= File(src_bsp + src_drv)
-CPPPATH = Dir('#')
+CPPPATH = str(Dir('#'))
 group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH)

 Return('group')
--- a/bsp/jz47xx/SConstruct
+++ b/bsp/jz47xx/SConstruct
@ -25,8 +25,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/lm3s8962/SConstruct
+++ b/bsp/lm3s8962/SConstruct
@ -25,7 +25,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)

-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/lm3s8962/lm3s_rom.ld
+++ b/bsp/lm3s8962/lm3s_rom.ld
@ -37,6 +37,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        _etext = .;
    } > CODE = 0

--- a/bsp/lm3s9b9x/SConstruct
+++ b/bsp/lm3s9b9x/SConstruct
@ -25,8 +25,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/lm3s9b9x/lm3s_rom.ld
+++ b/bsp/lm3s9b9x/lm3s_rom.ld
@ -37,6 +37,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        _etext = .;
    } > CODE = 0

--- a/bsp/lm4f232/SConstruct
+++ b/bsp/lm4f232/SConstruct
@ -25,8 +25,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/lm4f232/lm4f_rom.ld
+++ b/bsp/lm4f232/lm4f_rom.ld
@ -50,6 +50,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
    } > FLASH

    .data : AT(ADDR(.text) + SIZEOF(.text))
--- a/bsp/lpc176x/rtthread-lpc17xx.ld
+++ b/bsp/lpc176x/rtthread-lpc17xx.ld
@ -36,9 +36,10 @@ SECTIONS
        __vsymtab_start = .;
        KEEP(*(VSymTab))
        __vsymtab_end = .;
+
        . = ALIGN(4);
        __rt_init_start = .;
-        KEEP(*(.rti_fn*))
+        KEEP(*(SORT(.rti_fn*)))
        __rt_init_end = .;
        . = ALIGN(4);

--- a/bsp/lpc178x/SConstruct
+++ b/bsp/lpc178x/SConstruct
@ -28,8 +28,5 @@ objs = PrepareBuilding(env, RTT_ROOT)
 if GetDepend('RT_USING_RTGUI'):
    objs = objs + SConscript(RTT_ROOT + '/examples/gui/SConscript', variant_dir='build/examples/gui', duplicate=0)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/lpc178x/rtthread-lpc178x.ld
+++ b/bsp/lpc178x/rtthread-lpc178x.ld
@ -38,6 +38,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        . = ALIGN(4);
        _etext = .;
    } > CODE = 0
--- a/bsp/lpc2148/SConstruct
+++ b/bsp/lpc2148/SConstruct
@ -25,8 +25,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/lpc2148/lpc2148_rom.ld
+++ b/bsp/lpc2148/lpc2148_rom.ld
@ -41,6 +41,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
    } >CODE

    . = ALIGN(4);
--- a/bsp/lpc2478/SConstruct
+++ b/bsp/lpc2478/SConstruct
@ -25,8 +25,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/lpc2478/lpc2478_rom.lds
+++ b/bsp/lpc2478/lpc2478_rom.lds
@ -35,6 +35,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        . = ALIGN(4);
        _etext = .;
    } > CODE = 0
--- a/bsp/ls1bdev/SConstruct
+++ b/bsp/ls1bdev/SConstruct
@ -28,8 +28,5 @@ objs = PrepareBuilding(env, RTT_ROOT)
 if GetDepend('RT_USING_RTGUI'):
    objs = objs + SConscript(RTT_ROOT + '/examples/gui/SConscript', variant_dir='build/examples/gui', duplicate=0)
    
-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/m16c62p/SConstruct
+++ b/bsp/m16c62p/SConstruct
@ -39,8 +39,5 @@ if GetDepend('RT_USING_RTGUI'):
 # libc testsuite 
 # objs = objs + SConscript(RTT_ROOT + '/examples/libc/SConscript', variant_dir='build/examples/libc', duplicate=0)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/mb9bf500r/SConstruct
+++ b/bsp/mb9bf500r/SConstruct
@ -32,8 +32,5 @@ objs = PrepareBuilding(env, RTT_ROOT)

 objs = objs + SConscript('CMSIS/SConscript', variant_dir='build/bsp/CMSIS', duplicate=0)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/mb9bf500r/fm3_rom.ld
+++ b/bsp/mb9bf500r/fm3_rom.ld
@ -32,6 +32,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        . = ALIGN(4);
        _etext = .;
    } > CODE = 0
--- a/bsp/mb9bf506r/SConstruct
+++ b/bsp/mb9bf506r/SConstruct
@ -30,8 +30,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/mb9bf506r/rtthread-mb9bf506.ld
+++ b/bsp/mb9bf506r/rtthread-mb9bf506.ld
@ -122,6 +122,13 @@ SECTIONS
        KEEP(*(VSymTab))
        __vsymtab_end = .;
        . = ALIGN(4);
+
+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
    }

    /* .ARM.exidx is sorted, so has to go in its own output section.  */
@ -151,6 +158,7 @@ SECTIONS
        . = ALIGN (8);
        _edata = .;
    } >ram AT>rom
+
  .bss :
  {
    *(.shbss)
@ -161,6 +169,7 @@ SECTIONS
    _end = .;
    __end = .;
  } >ram AT>rom
+
  .heap :
  {
    *(.heap)
--- a/bsp/mini2440/SConstruct
+++ b/bsp/mini2440/SConstruct
@ -32,8 +32,5 @@ if GetDepend('RT_USING_RTGUI'):
 # libc testsuite 
 # objs = objs + SConscript(RTT_ROOT + '/examples/libc/SConscript', variant_dir='build/examples/libc', duplicate=0)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/mini2440/mini2440_ram.ld
+++ b/bsp/mini2440/mini2440_ram.ld
@ -23,6 +23,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);   

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        /* section information for modules */
        . = ALIGN(4);
        __rtmsymtab_start = .;
--- a/bsp/mini4020/SConstruct
+++ b/bsp/mini4020/SConstruct
@ -25,8 +25,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/sam7x/SConstruct
+++ b/bsp/sam7x/SConstruct
@ -30,8 +30,5 @@ objs = PrepareBuilding(env, RTT_ROOT)
 # kernel testsuite
 #objs = objs + SConscript(RTT_ROOT + '/examples/kernel/SConscript', variant_dir='build/examples/kernel', duplicate=0)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/sam7x/sam7x_rom.ld
+++ b/bsp/sam7x/sam7x_rom.ld
@ -26,6 +26,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
    } > CODE = 0

    . = ALIGN(4);
--- a/bsp/stm32f0x/SConstruct
+++ b/bsp/stm32f0x/SConstruct
@ -30,8 +30,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/stm32f0x/stm32_rom.ld
+++ b/bsp/stm32f0x/stm32_rom.ld
@ -38,6 +38,13 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        /* section information for initial. */
+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        . = ALIGN(4);
        _etext = .;
    } > CODE = 0
--- a/bsp/stm32f107/stm32_rom.ld
+++ b/bsp/stm32f107/stm32_rom.ld
@ -39,6 +39,13 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        /* section information for initial. */
+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        . = ALIGN(4);
        _etext = .;
    } > CODE = 0
--- a/bsp/stm32f10x/SConstruct
+++ b/bsp/stm32f10x/SConstruct
@ -33,8 +33,5 @@ objs = PrepareBuilding(env, RTT_ROOT)
 # STM32 firemare library building script
 objs = objs + SConscript( GetCurrentDir() + '/Libraries/SConscript', variant_dir='build/bsp/Libraries', duplicate=0)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/stm32f10x/stm32_rom.ld
+++ b/bsp/stm32f10x/stm32_rom.ld
@ -39,6 +39,13 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        /* section information for initial. */
+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        . = ALIGN(4);
        _etext = .;
    } > CODE = 0
--- a/bsp/stm32f20x/SConstruct
+++ b/bsp/stm32f20x/SConstruct
@ -30,8 +30,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/stm32f20x/stm32_rom.ld
+++ b/bsp/stm32f20x/stm32_rom.ld
@ -39,6 +39,13 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        /* section information for initial. */
+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        . = ALIGN(4);
        _etext = .;
    } > CODE = 0
--- a/bsp/stm32f40x/SConstruct
+++ b/bsp/stm32f40x/SConstruct
@ -30,8 +30,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/stm32f40x/stm32_rom.ld
+++ b/bsp/stm32f40x/stm32_rom.ld
@ -39,6 +39,13 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        /* section information for initial. */
+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        . = ALIGN(4);
        _etext = .;
    } > CODE = 0
--- a/bsp/taihu/applications/SConscript
+++ b/bsp/taihu/applications/SConscript
@ -4,7 +4,7 @@ from building import *

 cwd = GetCurrentDir()
 src = Glob('*.c')
-CPPPATH = [cwd, Dir('#')]
+CPPPATH = [cwd, str(Dir('#'))]

 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)

--- a/bsp/upd70f3454/SConstruct
+++ b/bsp/upd70f3454/SConstruct
@ -30,8 +30,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/x86/SConstruct
+++ b/bsp/x86/SConstruct
@ -25,8 +25,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/xplorer4330/m4/SConstruct
+++ b/bsp/xplorer4330/m4/SConstruct
@ -30,8 +30,5 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)

-# build program 
-env.Program(TARGET, objs)
-
-# end building 
-EndBuilding(TARGET)
+# make a building
+DoBuilding(TARGET, objs)
--- a/bsp/xplorer4330/m4/lpc4330_xplorer_spifi32mb.ld
+++ b/bsp/xplorer4330/m4/lpc4330_xplorer_spifi32mb.ld
@ -38,6 +38,12 @@ SECTIONS
        __vsymtab_end = .;
        . = ALIGN(4);

+        . = ALIGN(4);
+        __rt_init_start = .;
+        KEEP(*(SORT(.rti_fn*)))
+        __rt_init_end = .;
+        . = ALIGN(4);
+
        . = ALIGN(4);
        _etext = .;
    } > CODE = 0