diff options
| author | MiraculousConch <[email protected]> | 2017-12-03 01:35:11 +0800 |
|---|---|---|
| committer | MiraculousConch <[email protected]> | 2017-12-03 01:35:11 +0800 |
| commit | d8de70397e3ad78c073817a073e074db0118f25b (patch) | |
| tree | 2647d5b060a8be54dfed868ca8e31fd429bf36bf | |
| parent | 1462ba178d6eab312c800c98261a90c421b14b43 (diff) | |
| parent | d629a3c87f9bdaa259589bda34f05cb8ff351826 (diff) | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | bsp/qemu-vexpress-a9/qemu-nographic.sh | 1 | ||||
| -rw-r--r-- | bsp/qemu-vexpress-a9/rtconfig.py | 2 | ||||
| -rw-r--r-- | tools/building.py | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/bsp/qemu-vexpress-a9/qemu-nographic.sh b/bsp/qemu-vexpress-a9/qemu-nographic.sh new file mode 100644 index 0000000000..bf808dead2 --- /dev/null +++ b/bsp/qemu-vexpress-a9/qemu-nographic.sh @@ -0,0 +1 @@ +qemu-system-arm -M vexpress-a9 -kernel rtthread.elf -nographic diff --git a/bsp/qemu-vexpress-a9/rtconfig.py b/bsp/qemu-vexpress-a9/rtconfig.py index 0bd53277f5..1592f574f5 100644 --- a/bsp/qemu-vexpress-a9/rtconfig.py +++ b/bsp/qemu-vexpress-a9/rtconfig.py @@ -37,7 +37,7 @@ if PLATFORM == 'gcc': CFLAGS = DEVICE + ' -Wall' AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -D__ASSEMBLY__' LINK_SCRIPT = 'link.lds' - LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,system_vectors'+\ + LFLAGS = DEVICE + ' -nostartfiles -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,system_vectors'+\ ' -T %s' % LINK_SCRIPT CPATH = '' diff --git a/tools/building.py b/tools/building.py index 79c013527b..d855aaebdc 100644 --- a/tools/building.py +++ b/tools/building.py @@ -303,6 +303,11 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ LINKCOMSTR = 'LINK $TARGET' ) + # fix the linker for C++ + if GetDepend('RT_USING_CPLUSPLUS'): + if env['LINK'].find('gcc') != -1: + env['LINK'] = env['LINK'].replace('gcc', 'g++') + # we need to seperate the variant_dir for BSPs and the kernels. BSPs could # have their own components etc. If they point to the same folder, SCons # would find the wrong source code to compile. |