From bb20c33f1391be8bcca57e65c8005588e2b6d968 Mon Sep 17 00:00:00 2001 From: michael Date: Mon, 24 Aug 2020 11:33:49 +0800 Subject: [PATCH] bsp:ls2k:add c++ support --- bsp/ls2kdev/SConstruct | 1 + bsp/ls2kdev/ls2k_ram.lds | 19 +++++++++++++++++++ bsp/ls2kdev/rtconfig.py | 1 + 3 files changed, 21 insertions(+) diff --git a/bsp/ls2kdev/SConstruct b/bsp/ls2kdev/SConstruct index 69373ed71f..6fd6fc67f9 100644 --- a/bsp/ls2kdev/SConstruct +++ b/bsp/ls2kdev/SConstruct @@ -15,6 +15,7 @@ DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, AR = rtconfig.AR, ARFLAGS = '-rc', LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) diff --git a/bsp/ls2kdev/ls2k_ram.lds b/bsp/ls2kdev/ls2k_ram.lds index 8bec1e855b..ef08411550 100644 --- a/bsp/ls2kdev/ls2k_ram.lds +++ b/bsp/ls2kdev/ls2k_ram.lds @@ -78,6 +78,25 @@ SECTIONS *(.sdata.*) } + . = ALIGN(4); + .ctors : + { + PROVIDE(__ctors_start__ = .); + KEEP(*(SORT(.ctors.*))) + KEEP(*(.ctors)) + PROVIDE(__ctors_end__ = .); + } + + .dtors : + { + PROVIDE(__dtors_start__ = .); + KEEP(*(SORT(.dtors.*))) + KEEP(*(.dtors)) + PROVIDE(__dtors_end__ = .); + } + + + .stack : { . = ALIGN(8); diff --git a/bsp/ls2kdev/rtconfig.py b/bsp/ls2kdev/rtconfig.py index d932bf985b..0988198426 100644 --- a/bsp/ls2kdev/rtconfig.py +++ b/bsp/ls2kdev/rtconfig.py @@ -31,6 +31,7 @@ BUILD = 'debug' PREFIX = 'mips-sde-elf-' CC = PREFIX + 'gcc' +CXX = PREFIX + 'g++' AS = PREFIX + 'gcc' AR = PREFIX + 'ar' LINK = PREFIX + 'gcc'