From 95dfed04a3afe77c7678f5b28621dd5642f26d69 Mon Sep 17 00:00:00 2001 From: Rafal Babski Date: Wed, 8 Jul 2020 09:13:41 +0100 Subject: [PATCH 1/2] MSP430 runtime - fix error with unrecognized option -z gprbuild adds a flag -z to the linker commandline This causes following error during compilation: /opt/msp430-gcc/bin/../lib/gcc/msp430-elf/8.3.1/../../../../msp430-elf/bin/ld: unrecognized option '-z' /opt/msp430-gcc/bin/../lib/gcc/msp430-elf/8.3.1/../../../../msp430-elf/bin/ld: use the --help option for usage information collect2: error: ld returned 1 exit status The option -R passed to the gprbuild commandline prevents adding additional parameters. --- templates/concurrency_view/msp430_freertos_gpr/node.tmplt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/concurrency_view/msp430_freertos_gpr/node.tmplt b/templates/concurrency_view/msp430_freertos_gpr/node.tmplt index c095937b..1b712210 100644 --- a/templates/concurrency_view/msp430_freertos_gpr/node.tmplt +++ b/templates/concurrency_view/msp430_freertos_gpr/node.tmplt @@ -13,7 +13,7 @@ all: partitions partitions: freertos - gprbuild -p -P @_LOWER:Partition_Names_@.gpr -XCFG="Release" -cargs:C -DSTATIC="" + gprbuild -R -p -P @_LOWER:Partition_Names_@.gpr -XCFG="Release" -cargs:C -DSTATIC="" freertos: sh gather_freertos_files.sh -- GitLab From 923f4c7fc1a92600f49015dc8b551827468200e6 Mon Sep 17 00:00:00 2001 From: Rafal Babski Date: Wed, 8 Jul 2020 09:20:00 +0100 Subject: [PATCH 2/2] MSP430 runtime - fix wrong paths in generated gpr file --- .../concurrency_view/msp430_freertos_gpr/partition.tmplt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/concurrency_view/msp430_freertos_gpr/partition.tmplt b/templates/concurrency_view/msp430_freertos_gpr/partition.tmplt index 0715679c..9c96e028 100644 --- a/templates/concurrency_view/msp430_freertos_gpr/partition.tmplt +++ b/templates/concurrency_view/msp430_freertos_gpr/partition.tmplt @@ -89,7 +89,7 @@ project @_CAPITALIZE:Name_@ is case Build is when "Release" => for Default_Switches ("C") use - ("-I/opt/ti/msp430-gcc/include/", + ("-I/opt/msp430-gcc/include/", "-I.", "-I../FreeRTOS/Source/include", "-I../FreeRTOS/Source/portable/GCC/MSP430FR5969", @@ -113,7 +113,7 @@ project @_CAPITALIZE:Name_@ is & external_as_list("USER_CFLAGS", " "); when "Debug" => for Default_Switches ("C") use - ("-I/opt/ti/msp430-gcc/include/", + ("-I/opt/msp430-gcc/include/", "-I.", "-I../FreeRTOS/Source/include", "-I../FreeRTOS/Source/portable/GCC/MSP430FR5969", @@ -141,8 +141,8 @@ project @_CAPITALIZE:Name_@ is for Driver use "msp430-elf-gcc"; for Default_Switches ("C") use - ("-L/opt/ti/msp430-gcc/include/", - "-I/opt/ti/msp430-gcc/include/", + ("-L/opt/msp430-gcc/include/", + "-I/opt/msp430-gcc/include/", "-I.", "-I../FreeRTOS/Source/include", "-I../FreeRTOS/Source/portable/GCC/MSP430FR5969", -- GitLab