From 029cda0ee7311ee887adebccda82ec0da764a726 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 25 Mar 2020 12:15:49 +0100 Subject: msp430fr5994lp-256k: aspectc support AspectC++ is not aware of the type "__int20", so we need to map it to a type known to AspectC++ (only for ag++, not g++) and fix its autogenerated constructor signatures. --- src/arch/msp430fr5994lp/Makefile.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/arch/msp430fr5994lp') diff --git a/src/arch/msp430fr5994lp/Makefile.inc b/src/arch/msp430fr5994lp/Makefile.inc index c442f02..df0c1ab 100644 --- a/src/arch/msp430fr5994lp/Makefile.inc +++ b/src/arch/msp430fr5994lp/Makefile.inc @@ -15,7 +15,7 @@ COMMON_FLAGS += -mcpu=${CPU} -mmcu=${MCU} -DMULTIPASS_ARCH_msp430fr5994lp COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C ifneq (${msp430_large}, ) - COMMON_FLAGS += -mcode-region=either -mlarge -DADDR_20BIT + COMMON_FLAGS += -mcode-region=either -mlarge -DADDR_20BIT -include int20.h endif # LTO seems to be broken. @@ -31,7 +31,11 @@ ARCH_SHORTNAME = msp430 CXX_TARGETS += src/arch/msp430fr5994lp/arch.cc ifeq (${aspectc}, 1) - CXX = ag++ -r build/repo.acp -v 0 --c_compiler /opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin/msp430-elf-g++ -p . --Xcompiler + ifeq (${msp430_large}, ) + CXX = ag++ -r build/repo.acp -v 0 --c_compiler /opt/msp430/ti/msp430-gcc-full-linux-5.1.2.0/bin/msp430-elf-g++ -p . --Xcompiler + else + CXX = ag++ -r build/repo.acp -v 0 --c_compiler /home/derf/var/projects/multipass/src/arch/msp430fr5994lp-256k/g++wrap -p . --Xcompiler + endif endif ifneq ($(findstring adc,${arch_drivers}), ) -- cgit v1.2.3