diff --git a/pkg/maker/buildcontent.go b/pkg/maker/buildcontent.go index 8d2f093..d930d22 100644 --- a/pkg/maker/buildcontent.go +++ b/pkg/maker/buildcontent.go @@ -140,6 +140,8 @@ func OutputFiles(outputList []Output) (outputByProducts string, outputFile strin case "bin": outputByProducts += "\nset(BIN_FILE \"" + output.File + "\")" customCommands += "\n\n# Bin Conversion\n add_custom_command(TARGET ${CONTEXT} POST_BUILD COMMAND ${CMAKE_OBJCOPY} ${ELF2BIN})" + case "map": + outputByProducts += "\nset(LD_MAP_FILE \"" + output.File + "\")" case "cmse-lib": outputByProducts += "\nset(CMSE_LIB \"" + output.File + "\")" case "elf", "lib": @@ -150,6 +152,15 @@ func OutputFiles(outputList []Output) (outputByProducts string, outputFile strin return outputByProducts, outputFile, outputType, customCommands } +func HasMapFile(outputList []Output) bool { + for _, output := range outputList { + if output.Type == "map" { + return true + } + } + return false +} + func (m *Maker) AddStepSuffix(name string) string { if slices.Contains(m.Contexts, name) { name += "-build" @@ -809,6 +820,9 @@ func (c *Cbuild) LinkerOptions() (linkerVars string, linkerOptions string) { linkerOptions += "\n# Linker options\ntarget_link_options(${CONTEXT} PUBLIC\n " + AddShellPrefix("${LD_CPU}") + "\n " + AddShellPrefix("${_LS}\"${LD_SCRIPT_PP}\"") + if HasMapFile(c.BuildDescType.Output) { + linkerOptions += "\n " + AddShellPrefix("${LD_MAP}") + } if len(c.BuildDescType.Processor.Trustzone) > 0 { linkerOptions += "\n " + AddShellPrefix("${LD_SECURE}") } diff --git a/pkg/maker/buildcontent_test.go b/pkg/maker/buildcontent_test.go index 7ffa628..8529644 100644 --- a/pkg/maker/buildcontent_test.go +++ b/pkg/maker/buildcontent_test.go @@ -226,6 +226,10 @@ func TestBuildContent(t *testing.T) { File: "./secure.lib", Type: "cmse-lib", }, + { + File: "./project.map", + Type: "map", + }, } outputByProducts, outputFile, outputType, customCommands := maker.OutputFiles(output) assert.Equal(outputFile, "./arfifact.elf") @@ -233,6 +237,7 @@ func TestBuildContent(t *testing.T) { assert.Contains(outputByProducts, "binary.bin") assert.Contains(outputByProducts, "hexadecimal.hex") assert.Contains(outputByProducts, "secure.lib") + assert.Contains(outputByProducts, "project.map") assert.Contains(customCommands, "${ELF2BIN}") assert.Contains(customCommands, "${ELF2HEX}") }) @@ -403,8 +408,15 @@ add_dependencies(project.debug+target-executes cbuild.BuildDescType.Misc.Link = []string{"--link-flag"} cbuild.BuildDescType.Misc.LinkC = []string{"--linkC-flag"} cbuild.BuildDescType.Misc.LinkCPP = []string{"--linkCPP-flag"} + cbuild.BuildDescType.Output = []maker.Output{ + { + File: "./project.map", + Type: "map", + }, + } linkerVars, linkerOptions := cbuild.LinkerOptions() assert.Contains(linkerVars, "set(LD_SCRIPT \"${SOLUTION_ROOT}/path/to/script.ld\")") + assert.Contains(linkerOptions, "${LD_MAP}") assert.Contains(linkerOptions, "${LD_SECURE}") assert.Contains(linkerOptions, "--link-flag") assert.Contains(linkerOptions, "--linkC-flag") diff --git a/test/data/solutions/linker-pre-processing/project/project.AC6+ARMCM0.cbuild.yml b/test/data/solutions/linker-pre-processing/project/project.AC6+ARMCM0.cbuild.yml index f6a9b9e..f102bb6 100644 --- a/test/data/solutions/linker-pre-processing/project/project.AC6+ARMCM0.cbuild.yml +++ b/test/data/solutions/linker-pre-processing/project/project.AC6+ARMCM0.cbuild.yml @@ -1,19 +1,19 @@ build: - generated-by: csolution version 0.0.0+g447ad5d7 + generated-by: csolution version 2.6.0 solution: ../solution.csolution.yml project: project.cproject.yml context: project.AC6+ARMCM0 compiler: AC6 device: ARMCM0 - device-pack: ARM::Cortex_DFP@1.0.0 + device-pack: ARM::Cortex_DFP@1.1.0 processor: fpu: off core: Cortex-M0 packs: - - pack: ARM::CMSIS@6.0.0 - path: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0 - - pack: ARM::Cortex_DFP@1.0.0 - path: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0 + - pack: ARM::CMSIS@6.1.0 + path: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0 + - pack: ARM::Cortex_DFP@1.1.0 + path: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0 misc: ASM: - -masm=auto @@ -29,63 +29,62 @@ build: - -Wno-parentheses-equality - -Wno-license-management Link: - - --info summarysizes - - --info sizes - - --info totals - - --info unused - --entry=Reset_Handler - - --map - - --summary_stderr - --diag_suppress=L6314W define: - ARMCM0 - _RTE_ + define-asm: + - ARMCM0 + - _RTE_ add-path: - RTE/_AC6_ARMCM0 - - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include add-path-asm: - RTE/_AC6_ARMCM0 - - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include output-dirs: - intdir: ../tmp/project/ARMCM0/AC6 + intdir: ../tmp outdir: ../out/project/ARMCM0/AC6 rtedir: RTE output: - type: elf file: project.axf + - type: map + file: project.map components: - - component: ARM::CMSIS:CORE@6.0.0 + - component: ARM::CMSIS:CORE@6.1.0 condition: ARMv6_7_8-M Device - from-pack: ARM::CMSIS@6.0.0 + from-pack: ARM::CMSIS@6.1.0 selected-by: ARM::CMSIS:CORE files: - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include category: include - version: 6.0.0 - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include/tz_context.h + version: 6.1.0 + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include/tz_context.h category: header - version: 6.0.0 - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Template/ARMv8-M/main_s.c + version: 6.1.0 + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Template/ARMv8-M/main_s.c category: sourceC attr: template version: 1.1.1 select: Secure mode 'main' module for ARMv8-M - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Template/ARMv8-M/tz_context.c + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Template/ARMv8-M/tz_context.c category: sourceC attr: template version: 1.1.1 select: RTOS Context Management (TrustZone for ARMv8-M) - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Documentation/html/Core/index.html + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Documentation/html/Core/index.html category: doc - version: 6.0.0 + version: 6.1.0 - component: ARM::Device:Startup&C Startup@2.2.0 condition: ARMCM0 CMSIS - from-pack: ARM::Cortex_DFP@1.0.0 + from-pack: ARM::Cortex_DFP@1.1.0 selected-by: ARM::Device:Startup&C Startup files: - - file: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include/ARMCM0.h + - file: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include/ARMCM0.h category: header version: 2.2.0 - file: RTE/Device/ARMCM0/ARMCM0_ac6.sct @@ -108,21 +107,16 @@ build: groups: - group: Source files: - - file: ./main.c + - file: main.c category: sourceC constructed-files: - file: RTE/_AC6_ARMCM0/RTE_Components.h category: header licenses: - - license: - license-agreement: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/LICENSE - packs: - - pack: ARM::CMSIS@6.0.0 - components: - - component: ARM::CMSIS:CORE@6.0.0 - - license: - license-agreement: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/LICENSE + - license: Apache-2.0 packs: - - pack: ARM::Cortex_DFP@1.0.0 + - pack: ARM::CMSIS@6.1.0 + - pack: ARM::Cortex_DFP@1.1.0 components: + - component: ARM::CMSIS:CORE@6.1.0 - component: ARM::Device:Startup&C Startup@2.2.0 diff --git a/test/data/solutions/linker-pre-processing/project/project.CLANG+ARMCM0.cbuild.yml b/test/data/solutions/linker-pre-processing/project/project.CLANG+ARMCM0.cbuild.yml index 581ef6e..8b13830 100644 --- a/test/data/solutions/linker-pre-processing/project/project.CLANG+ARMCM0.cbuild.yml +++ b/test/data/solutions/linker-pre-processing/project/project.CLANG+ARMCM0.cbuild.yml @@ -1,19 +1,19 @@ build: - generated-by: csolution version 0.0.0+g447ad5d7 + generated-by: csolution version 2.6.0 solution: ../solution.csolution.yml project: project.cproject.yml context: project.CLANG+ARMCM0 compiler: CLANG device: ARMCM0 - device-pack: ARM::Cortex_DFP@1.0.0 + device-pack: ARM::Cortex_DFP@1.1.0 processor: fpu: off core: Cortex-M0 packs: - - pack: ARM::CMSIS@6.0.0 - path: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0 - - pack: ARM::Cortex_DFP@1.0.0 - path: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0 + - pack: ARM::CMSIS@6.1.0 + path: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0 + - pack: ARM::Cortex_DFP@1.1.0 + path: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0 misc: C: - -std=gnu11 @@ -25,59 +25,62 @@ build: - -ffunction-sections - -fdata-sections Link: - - -lcrt0-semihost - - -lsemihost - - -Wl,-Map=../out/project/ARMCM0/CLANG/project.elf.map + - -lcrt0 - -Wl,--gc-sections define: - ARMCM0 - _RTE_ + define-asm: + - ARMCM0 + - _RTE_ add-path: - RTE/_CLANG_ARMCM0 - - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include add-path-asm: - RTE/_CLANG_ARMCM0 - - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include output-dirs: - intdir: ../tmp/project/ARMCM0/CLANG + intdir: ../tmp outdir: ../out/project/ARMCM0/CLANG rtedir: RTE output: - type: elf file: project.elf + - type: map + file: project.map components: - - component: ARM::CMSIS:CORE@6.0.0 + - component: ARM::CMSIS:CORE@6.1.0 condition: ARMv6_7_8-M Device - from-pack: ARM::CMSIS@6.0.0 + from-pack: ARM::CMSIS@6.1.0 selected-by: ARM::CMSIS:CORE files: - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include category: include - version: 6.0.0 - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include/tz_context.h + version: 6.1.0 + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include/tz_context.h category: header - version: 6.0.0 - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Template/ARMv8-M/main_s.c + version: 6.1.0 + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Template/ARMv8-M/main_s.c category: sourceC attr: template version: 1.1.1 select: Secure mode 'main' module for ARMv8-M - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Template/ARMv8-M/tz_context.c + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Template/ARMv8-M/tz_context.c category: sourceC attr: template version: 1.1.1 select: RTOS Context Management (TrustZone for ARMv8-M) - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Documentation/html/Core/index.html + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Documentation/html/Core/index.html category: doc - version: 6.0.0 + version: 6.1.0 - component: ARM::Device:Startup&C Startup@2.2.0 condition: ARMCM0 CMSIS - from-pack: ARM::Cortex_DFP@1.0.0 + from-pack: ARM::Cortex_DFP@1.1.0 selected-by: ARM::Device:Startup&C Startup files: - - file: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include/ARMCM0.h + - file: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include/ARMCM0.h category: header version: 2.2.0 - file: RTE/Device/ARMCM0/startup_ARMCM0.c @@ -96,21 +99,16 @@ build: groups: - group: Source files: - - file: ./main.c + - file: main.c category: sourceC constructed-files: - file: RTE/_CLANG_ARMCM0/RTE_Components.h category: header licenses: - - license: - license-agreement: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/LICENSE - packs: - - pack: ARM::CMSIS@6.0.0 - components: - - component: ARM::CMSIS:CORE@6.0.0 - - license: - license-agreement: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/LICENSE + - license: Apache-2.0 packs: - - pack: ARM::Cortex_DFP@1.0.0 + - pack: ARM::CMSIS@6.1.0 + - pack: ARM::Cortex_DFP@1.1.0 components: + - component: ARM::CMSIS:CORE@6.1.0 - component: ARM::Device:Startup&C Startup@2.2.0 diff --git a/test/data/solutions/linker-pre-processing/project/project.GCC+ARMCM0.cbuild.yml b/test/data/solutions/linker-pre-processing/project/project.GCC+ARMCM0.cbuild.yml index e8305cd..520c775 100644 --- a/test/data/solutions/linker-pre-processing/project/project.GCC+ARMCM0.cbuild.yml +++ b/test/data/solutions/linker-pre-processing/project/project.GCC+ARMCM0.cbuild.yml @@ -1,19 +1,19 @@ build: - generated-by: csolution version 0.0.0+g447ad5d7 + generated-by: csolution version 2.6.0 solution: ../solution.csolution.yml project: project.cproject.yml context: project.GCC+ARMCM0 compiler: GCC device: ARMCM0 - device-pack: ARM::Cortex_DFP@1.0.0 + device-pack: ARM::Cortex_DFP@1.1.0 processor: fpu: off core: Cortex-M0 packs: - - pack: ARM::CMSIS@6.0.0 - path: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0 - - pack: ARM::Cortex_DFP@1.0.0 - path: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0 + - pack: ARM::CMSIS@6.1.0 + path: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0 + - pack: ARM::Cortex_DFP@1.1.0 + path: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0 misc: C: - -std=gnu11 @@ -28,58 +28,63 @@ build: - -fdata-sections Link: - --specs=nano.specs - - --specs=rdimon.specs - - -Wl,-Map=../out/project/ARMCM0/GCC/project.elf.map + - --specs=nosys.specs - -Wl,--gc-sections + - -Wl,--no-warn-rwx-segments define: - ARMCM0 - _RTE_ + define-asm: + - ARMCM0 + - _RTE_ add-path: - RTE/_GCC_ARMCM0 - - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include add-path-asm: - RTE/_GCC_ARMCM0 - - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include output-dirs: - intdir: ../tmp/project/ARMCM0/GCC + intdir: ../tmp outdir: ../out/project/ARMCM0/GCC rtedir: RTE output: - type: elf file: project.elf + - type: map + file: project.map components: - - component: ARM::CMSIS:CORE@6.0.0 + - component: ARM::CMSIS:CORE@6.1.0 condition: ARMv6_7_8-M Device - from-pack: ARM::CMSIS@6.0.0 + from-pack: ARM::CMSIS@6.1.0 selected-by: ARM::CMSIS:CORE files: - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include category: include - version: 6.0.0 - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include/tz_context.h + version: 6.1.0 + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include/tz_context.h category: header - version: 6.0.0 - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Template/ARMv8-M/main_s.c + version: 6.1.0 + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Template/ARMv8-M/main_s.c category: sourceC attr: template version: 1.1.1 select: Secure mode 'main' module for ARMv8-M - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Template/ARMv8-M/tz_context.c + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Template/ARMv8-M/tz_context.c category: sourceC attr: template version: 1.1.1 select: RTOS Context Management (TrustZone for ARMv8-M) - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Documentation/html/Core/index.html + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Documentation/html/Core/index.html category: doc - version: 6.0.0 + version: 6.1.0 - component: ARM::Device:Startup&C Startup@2.2.0 condition: ARMCM0 CMSIS - from-pack: ARM::Cortex_DFP@1.0.0 + from-pack: ARM::Cortex_DFP@1.1.0 selected-by: ARM::Device:Startup&C Startup files: - - file: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include/ARMCM0.h + - file: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include/ARMCM0.h category: header version: 2.2.0 - file: RTE/Device/ARMCM0/ARMCM0_gcc.ld @@ -102,21 +107,16 @@ build: groups: - group: Source files: - - file: ./main.c + - file: main.c category: sourceC constructed-files: - file: RTE/_GCC_ARMCM0/RTE_Components.h category: header licenses: - - license: - license-agreement: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/LICENSE - packs: - - pack: ARM::CMSIS@6.0.0 - components: - - component: ARM::CMSIS:CORE@6.0.0 - - license: - license-agreement: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/LICENSE + - license: Apache-2.0 packs: - - pack: ARM::Cortex_DFP@1.0.0 + - pack: ARM::CMSIS@6.1.0 + - pack: ARM::Cortex_DFP@1.1.0 components: + - component: ARM::CMSIS:CORE@6.1.0 - component: ARM::Device:Startup&C Startup@2.2.0 diff --git a/test/data/solutions/linker-pre-processing/project/project.IAR+ARMCM0.cbuild.yml b/test/data/solutions/linker-pre-processing/project/project.IAR+ARMCM0.cbuild.yml index 775d5e8..82c460e 100644 --- a/test/data/solutions/linker-pre-processing/project/project.IAR+ARMCM0.cbuild.yml +++ b/test/data/solutions/linker-pre-processing/project/project.IAR+ARMCM0.cbuild.yml @@ -1,76 +1,78 @@ build: - generated-by: csolution version 0.0.0+g447ad5d7 + generated-by: csolution version 2.6.0 solution: ../solution.csolution.yml project: project.cproject.yml context: project.IAR+ARMCM0 compiler: IAR device: ARMCM0 - device-pack: ARM::Cortex_DFP@1.0.0 + device-pack: ARM::Cortex_DFP@1.1.0 processor: fpu: off core: Cortex-M0 packs: - - pack: ARM::CMSIS@6.0.0 - path: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0 - - pack: ARM::Cortex_DFP@1.0.0 - path: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0 + - pack: ARM::CMSIS@6.1.0 + path: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0 + - pack: ARM::Cortex_DFP@1.1.0 + path: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0 misc: C: - --dlib_config DLib_Config_Full.h CPP: - --dlib_config DLib_Config_Full.h - Link: - - --semihosting - - --map=../out/project/ARMCM0/IAR/project.out.map define: - ARMCM0 - _RTE_ + define-asm: + - ARMCM0 + - _RTE_ add-path: - RTE/_IAR_ARMCM0 - - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include add-path-asm: - RTE/_IAR_ARMCM0 - - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include output-dirs: - intdir: ../tmp/project/ARMCM0/IAR + intdir: ../tmp outdir: ../out/project/ARMCM0/IAR rtedir: RTE output: - type: elf file: project.out + - type: map + file: project.map components: - - component: ARM::CMSIS:CORE@6.0.0 + - component: ARM::CMSIS:CORE@6.1.0 condition: ARMv6_7_8-M Device - from-pack: ARM::CMSIS@6.0.0 + from-pack: ARM::CMSIS@6.1.0 selected-by: ARM::CMSIS:CORE files: - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include category: include - version: 6.0.0 - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include/tz_context.h + version: 6.1.0 + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include/tz_context.h category: header - version: 6.0.0 - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Template/ARMv8-M/main_s.c + version: 6.1.0 + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Template/ARMv8-M/main_s.c category: sourceC attr: template version: 1.1.1 select: Secure mode 'main' module for ARMv8-M - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Template/ARMv8-M/tz_context.c + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Template/ARMv8-M/tz_context.c category: sourceC attr: template version: 1.1.1 select: RTOS Context Management (TrustZone for ARMv8-M) - - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Documentation/html/Core/index.html + - file: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Documentation/html/Core/index.html category: doc - version: 6.0.0 + version: 6.1.0 - component: ARM::Device:Startup&C Startup@2.2.0 condition: ARMCM0 CMSIS - from-pack: ARM::Cortex_DFP@1.0.0 + from-pack: ARM::Cortex_DFP@1.1.0 selected-by: ARM::Device:Startup&C Startup files: - - file: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include/ARMCM0.h + - file: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include/ARMCM0.h category: header version: 2.2.0 - file: RTE/Device/ARMCM0/startup_ARMCM0.c @@ -89,21 +91,16 @@ build: groups: - group: Source files: - - file: ./main.c + - file: main.c category: sourceC constructed-files: - file: RTE/_IAR_ARMCM0/RTE_Components.h category: header licenses: - - license: - license-agreement: ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/LICENSE - packs: - - pack: ARM::CMSIS@6.0.0 - components: - - component: ARM::CMSIS:CORE@6.0.0 - - license: - license-agreement: ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/LICENSE + - license: Apache-2.0 packs: - - pack: ARM::Cortex_DFP@1.0.0 + - pack: ARM::CMSIS@6.1.0 + - pack: ARM::Cortex_DFP@1.1.0 components: + - component: ARM::CMSIS:CORE@6.1.0 - component: ARM::Device:Startup&C Startup@2.2.0 diff --git a/test/data/solutions/linker-pre-processing/project/project.cproject.yml b/test/data/solutions/linker-pre-processing/project/project.cproject.yml index fa74a6b..f4cd8dd 100644 --- a/test/data/solutions/linker-pre-processing/project/project.cproject.yml +++ b/test/data/solutions/linker-pre-processing/project/project.cproject.yml @@ -12,3 +12,7 @@ project: linker: - define: - DEF_LD_PP + + output: + type: + - map diff --git a/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/CMakeLists.txt index ff907fc..b77279a 100644 --- a/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/CMakeLists.txt +++ b/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/CMakeLists.txt @@ -7,6 +7,7 @@ set(CONTEXT project.AC6+ARMCM0) set(TARGET ${CONTEXT}) set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/AC6") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +set(LD_MAP_FILE "project.map") set(LD_SCRIPT "${SOLUTION_ROOT}/project/RTE/Device/ARMCM0/ac6_linker_script.sct.src") set(LD_REGIONS "${SOLUTION_ROOT}/project/RTE/Device/ARMCM0/regions_ARMCM0.h") set(LD_SCRIPT_PP_DEFINES @@ -40,8 +41,8 @@ add_library(${CONTEXT}_GLOBAL INTERFACE) # Includes target_include_directories(${CONTEXT} PUBLIC ${SOLUTION_ROOT}/project/RTE/_AC6_ARMCM0 - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include ) # Defines @@ -71,7 +72,7 @@ include("components.cmake") target_link_libraries(${CONTEXT} PUBLIC Group_Source - ARM_CMSIS_CORE_6_0_0 + ARM_CMSIS_CORE_6_1_0 ARM_Device_Startup_C_Startup_2_2_0 ) @@ -79,13 +80,8 @@ target_link_libraries(${CONTEXT} PUBLIC target_link_options(${CONTEXT} PUBLIC "SHELL:${LD_CPU}" "SHELL:${_LS}\"${LD_SCRIPT_PP}\"" - "SHELL:--info summarysizes" - "SHELL:--info sizes" - "SHELL:--info totals" - "SHELL:--info unused" + "SHELL:${LD_MAP}" "SHELL:--entry=Reset_Handler" - "SHELL:--map" - "SHELL:--summary_stderr" "SHELL:--diag_suppress=L6314W" ) set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT}) diff --git a/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/components.cmake b/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/components.cmake index b94b29d..a280b64 100644 --- a/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/components.cmake +++ b/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/components.cmake @@ -1,12 +1,12 @@ # components.cmake -# component ARM::CMSIS:CORE@6.0.0 -add_library(ARM_CMSIS_CORE_6_0_0 INTERFACE) -target_include_directories(ARM_CMSIS_CORE_6_0_0 INTERFACE +# component ARM::CMSIS:CORE@6.1.0 +add_library(ARM_CMSIS_CORE_6_1_0 INTERFACE) +target_include_directories(ARM_CMSIS_CORE_6_1_0 INTERFACE $ - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include + ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include ) -target_compile_definitions(ARM_CMSIS_CORE_6_0_0 INTERFACE +target_compile_definitions(ARM_CMSIS_CORE_6_1_0 INTERFACE $ ) @@ -17,7 +17,7 @@ add_library(ARM_Device_Startup_C_Startup_2_2_0 OBJECT ) target_include_directories(ARM_Device_Startup_C_Startup_2_2_0 PUBLIC $ - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include ) target_compile_definitions(ARM_Device_Startup_C_Startup_2_2_0 PUBLIC $ diff --git a/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/CMakeLists.txt index 98ef884..cffe30a 100644 --- a/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/CMakeLists.txt +++ b/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/CMakeLists.txt @@ -7,6 +7,7 @@ set(CONTEXT project.CLANG+ARMCM0) set(TARGET ${CONTEXT}) set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/CLANG") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +set(LD_MAP_FILE "project.map") set(LD_SCRIPT "${SOLUTION_ROOT}/project/RTE/Device/ARMCM0/clang_linker_script.ld.src") set(LD_REGIONS "${SOLUTION_ROOT}/project/RTE/Device/ARMCM0/regions_ARMCM0.h") set(LD_SCRIPT_PP_DEFINES @@ -40,8 +41,8 @@ add_library(${CONTEXT}_GLOBAL INTERFACE) # Includes target_include_directories(${CONTEXT} PUBLIC ${SOLUTION_ROOT}/project/RTE/_CLANG_ARMCM0 - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include ) # Defines @@ -70,7 +71,7 @@ include("components.cmake") target_link_libraries(${CONTEXT} PUBLIC Group_Source - ARM_CMSIS_CORE_6_0_0 + ARM_CMSIS_CORE_6_1_0 ARM_Device_Startup_C_Startup_2_2_0 ) @@ -78,9 +79,8 @@ target_link_libraries(${CONTEXT} PUBLIC target_link_options(${CONTEXT} PUBLIC "SHELL:${LD_CPU}" "SHELL:${_LS}\"${LD_SCRIPT_PP}\"" - "SHELL:-lcrt0-semihost" - "SHELL:-lsemihost" - "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/CLANG/project.elf.map" + "SHELL:${LD_MAP}" + "SHELL:-lcrt0" "SHELL:-Wl,--gc-sections" ) set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT}) diff --git a/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/components.cmake b/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/components.cmake index b94b29d..a280b64 100644 --- a/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/components.cmake +++ b/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/components.cmake @@ -1,12 +1,12 @@ # components.cmake -# component ARM::CMSIS:CORE@6.0.0 -add_library(ARM_CMSIS_CORE_6_0_0 INTERFACE) -target_include_directories(ARM_CMSIS_CORE_6_0_0 INTERFACE +# component ARM::CMSIS:CORE@6.1.0 +add_library(ARM_CMSIS_CORE_6_1_0 INTERFACE) +target_include_directories(ARM_CMSIS_CORE_6_1_0 INTERFACE $ - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include + ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include ) -target_compile_definitions(ARM_CMSIS_CORE_6_0_0 INTERFACE +target_compile_definitions(ARM_CMSIS_CORE_6_1_0 INTERFACE $ ) @@ -17,7 +17,7 @@ add_library(ARM_Device_Startup_C_Startup_2_2_0 OBJECT ) target_include_directories(ARM_Device_Startup_C_Startup_2_2_0 PUBLIC $ - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include ) target_compile_definitions(ARM_Device_Startup_C_Startup_2_2_0 PUBLIC $ diff --git a/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/CMakeLists.txt index 582a33c..b072dc9 100644 --- a/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/CMakeLists.txt +++ b/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/CMakeLists.txt @@ -7,6 +7,7 @@ set(CONTEXT project.GCC+ARMCM0) set(TARGET ${CONTEXT}) set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/GCC") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +set(LD_MAP_FILE "project.map") set(LD_SCRIPT "${SOLUTION_ROOT}/project/RTE/Device/ARMCM0/gcc_linker_script.ld.src") set(LD_REGIONS "${SOLUTION_ROOT}/project/RTE/Device/ARMCM0/regions_ARMCM0.h") set(LD_SCRIPT_PP_DEFINES @@ -40,8 +41,8 @@ add_library(${CONTEXT}_GLOBAL INTERFACE) # Includes target_include_directories(${CONTEXT} PUBLIC ${SOLUTION_ROOT}/project/RTE/_GCC_ARMCM0 - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include ) # Defines @@ -71,7 +72,7 @@ include("components.cmake") target_link_libraries(${CONTEXT} PUBLIC Group_Source - ARM_CMSIS_CORE_6_0_0 + ARM_CMSIS_CORE_6_1_0 ARM_Device_Startup_C_Startup_2_2_0 ) @@ -79,10 +80,11 @@ target_link_libraries(${CONTEXT} PUBLIC target_link_options(${CONTEXT} PUBLIC "SHELL:${LD_CPU}" "SHELL:${_LS}\"${LD_SCRIPT_PP}\"" + "SHELL:${LD_MAP}" "SHELL:--specs=nano.specs" - "SHELL:--specs=rdimon.specs" - "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/GCC/project.elf.map" + "SHELL:--specs=nosys.specs" "SHELL:-Wl,--gc-sections" + "SHELL:-Wl,--no-warn-rwx-segments" ) set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT}) diff --git a/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/components.cmake b/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/components.cmake index b94b29d..a280b64 100644 --- a/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/components.cmake +++ b/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/components.cmake @@ -1,12 +1,12 @@ # components.cmake -# component ARM::CMSIS:CORE@6.0.0 -add_library(ARM_CMSIS_CORE_6_0_0 INTERFACE) -target_include_directories(ARM_CMSIS_CORE_6_0_0 INTERFACE +# component ARM::CMSIS:CORE@6.1.0 +add_library(ARM_CMSIS_CORE_6_1_0 INTERFACE) +target_include_directories(ARM_CMSIS_CORE_6_1_0 INTERFACE $ - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include + ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include ) -target_compile_definitions(ARM_CMSIS_CORE_6_0_0 INTERFACE +target_compile_definitions(ARM_CMSIS_CORE_6_1_0 INTERFACE $ ) @@ -17,7 +17,7 @@ add_library(ARM_Device_Startup_C_Startup_2_2_0 OBJECT ) target_include_directories(ARM_Device_Startup_C_Startup_2_2_0 PUBLIC $ - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include ) target_compile_definitions(ARM_Device_Startup_C_Startup_2_2_0 PUBLIC $ diff --git a/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/CMakeLists.txt index d617387..2a447e2 100644 --- a/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/CMakeLists.txt +++ b/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/CMakeLists.txt @@ -7,6 +7,7 @@ set(CONTEXT project.IAR+ARMCM0) set(TARGET ${CONTEXT}) set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/IAR") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +set(LD_MAP_FILE "project.map") set(LD_SCRIPT "${SOLUTION_ROOT}/project/RTE/Device/ARMCM0/iar_linker_script.icf.src") set(LD_REGIONS "${SOLUTION_ROOT}/project/RTE/Device/ARMCM0/regions_ARMCM0.h") set(LD_SCRIPT_PP_DEFINES @@ -40,8 +41,8 @@ add_library(${CONTEXT}_GLOBAL INTERFACE) # Includes target_include_directories(${CONTEXT} PUBLIC ${SOLUTION_ROOT}/project/RTE/_IAR_ARMCM0 - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include + ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include ) # Defines @@ -67,7 +68,7 @@ include("components.cmake") target_link_libraries(${CONTEXT} PUBLIC Group_Source - ARM_CMSIS_CORE_6_0_0 + ARM_CMSIS_CORE_6_1_0 ARM_Device_Startup_C_Startup_2_2_0 ) @@ -75,8 +76,7 @@ target_link_libraries(${CONTEXT} PUBLIC target_link_options(${CONTEXT} PUBLIC "SHELL:${LD_CPU}" "SHELL:${_LS}\"${LD_SCRIPT_PP}\"" - "SHELL:--semihosting" - "SHELL:--map=${SOLUTION_ROOT}/out/project/ARMCM0/IAR/project.out.map" + "SHELL:${LD_MAP}" ) set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT}) diff --git a/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/components.cmake b/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/components.cmake index b94b29d..a280b64 100644 --- a/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/components.cmake +++ b/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/components.cmake @@ -1,12 +1,12 @@ # components.cmake -# component ARM::CMSIS:CORE@6.0.0 -add_library(ARM_CMSIS_CORE_6_0_0 INTERFACE) -target_include_directories(ARM_CMSIS_CORE_6_0_0 INTERFACE +# component ARM::CMSIS:CORE@6.1.0 +add_library(ARM_CMSIS_CORE_6_1_0 INTERFACE) +target_include_directories(ARM_CMSIS_CORE_6_1_0 INTERFACE $ - ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.0.0/CMSIS/Core/Include + ${CMSIS_PACK_ROOT}/ARM/CMSIS/6.1.0/CMSIS/Core/Include ) -target_compile_definitions(ARM_CMSIS_CORE_6_0_0 INTERFACE +target_compile_definitions(ARM_CMSIS_CORE_6_1_0 INTERFACE $ ) @@ -17,7 +17,7 @@ add_library(ARM_Device_Startup_C_Startup_2_2_0 OBJECT ) target_include_directories(ARM_Device_Startup_C_Startup_2_2_0 PUBLIC $ - ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.0.0/Device/ARMCM0/Include + ${CMSIS_PACK_ROOT}/ARM/Cortex_DFP/1.1.0/Device/ARMCM0/Include ) target_compile_definitions(ARM_Device_Startup_C_Startup_2_2_0 PUBLIC $ diff --git a/test/data/solutions/linker-pre-processing/solution.cbuild-idx.yml b/test/data/solutions/linker-pre-processing/solution.cbuild-idx.yml index 62bf906..3a28bf7 100644 --- a/test/data/solutions/linker-pre-processing/solution.cbuild-idx.yml +++ b/test/data/solutions/linker-pre-processing/solution.cbuild-idx.yml @@ -1,19 +1,36 @@ build-idx: - generated-by: csolution version 2.2.1 + generated-by: csolution version 2.6.0 cdefault: ${CMSIS_COMPILER_ROOT}/cdefault.yml csolution: solution.csolution.yml + tmpdir: tmp cprojects: - cproject: project/project.cproject.yml cbuilds: - cbuild: project/project.AC6+ARMCM0.cbuild.yml project: project configuration: .AC6+ARMCM0 - - cbuild: project/project.CLANG+ARMCM0.cbuild.yml - project: project - configuration: .CLANG+ARMCM0 + messages: + info: + - solution.cbuild-pack.yml - file generated successfully + - project.AC6+ARMCM0.cbuild.yml - file generated successfully - cbuild: project/project.GCC+ARMCM0.cbuild.yml project: project configuration: .GCC+ARMCM0 + messages: + info: + - solution.cbuild-pack.yml - file generated successfully + - project.GCC+ARMCM0.cbuild.yml - file generated successfully - cbuild: project/project.IAR+ARMCM0.cbuild.yml project: project configuration: .IAR+ARMCM0 + messages: + info: + - solution.cbuild-pack.yml - file generated successfully + - project.IAR+ARMCM0.cbuild.yml - file generated successfully + - cbuild: project/project.CLANG+ARMCM0.cbuild.yml + project: project + configuration: .CLANG+ARMCM0 + messages: + info: + - solution.cbuild-pack.yml - file generated successfully + - project.CLANG+ARMCM0.cbuild.yml - file generated successfully diff --git a/test/data/solutions/linker-pre-processing/solution.csolution.yml b/test/data/solutions/linker-pre-processing/solution.csolution.yml index e58a643..1334088 100644 --- a/test/data/solutions/linker-pre-processing/solution.csolution.yml +++ b/test/data/solutions/linker-pre-processing/solution.csolution.yml @@ -1,5 +1,5 @@ solution: - created-for: CMSIS-Toolbox@2.2.1 + created-for: CMSIS-Toolbox@2.6.0 cdefault: packs: @@ -25,11 +25,3 @@ solution: projects: - project: ./project/project.cproject.yml - - misc: - - for-compiler: AC6 - Link: - - --info summarysizes - - --info sizes - - --info totals - - --info unused