From 6ec0458bc5e41f5eb567b4a2d5e5e106f081369e Mon Sep 17 00:00:00 2001 From: Alexis Lockwood Date: Wed, 11 Jan 2023 12:46:52 -0700 Subject: [PATCH] Add option to set stack size Closes #4 --- meson.build | 19 ------------------- subprojects/ch32v10x | 2 +- subprojects/ch32v30x | 2 +- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/meson.build b/meson.build index da1893d..1157cc3 100644 --- a/meson.build +++ b/meson.build @@ -9,14 +9,12 @@ ch32v10x_proj = subproject('ch32v10x') ch32v10x_dep = ch32v10x_proj.get_variable('ch32v10x_dep') ch32v10x_sys_dep = ch32v10x_proj.get_variable('ch32v10x_sys_dep') dependencies = [ch32v10x_dep, ch32v10x_sys_dep] -linker_script = 'subprojects/ch32v10x/Ld/Link.ld' ## END USER MUST MODIFY: KEEP ONLY THE 10x or 30x BLOCK ch32v30x_proj = subproject('ch32v30x', default_options: ['variant=CH32V307']) ch32v30x_dep = ch32v30x_proj.get_variable('ch32v30x_dep') ch32v30x_sys_dep = ch32v30x_proj.get_variable('ch32v30x_sys_dep') dependencies = [ch32v30x_dep, ch32v30x_sys_dep] -linker_script = 'subprojects/ch32v30x/Ld/Link.ld' sources = [ 'src/main.c', @@ -28,23 +26,6 @@ includes = [ _incl_dirs = include_directories(includes) -if linker_script != '' - fn = meson.source_root() / linker_script - add_project_link_arguments('-T' + fn, language: ['c', 'cpp']) -endif - -add_project_arguments( - '-ffunction-sections', - '-fdata-sections', - '-ggdb3', - language: ['c', 'cpp'] -) -add_project_link_arguments( - '-Wl,-gc-sections', - '-nostartfiles', - language: ['c', 'cpp'] -) - objcopy = find_program('objcopy') objdump = find_program('objdump') size = find_program('size') diff --git a/subprojects/ch32v10x b/subprojects/ch32v10x index 6c6fa38..99e395e 160000 --- a/subprojects/ch32v10x +++ b/subprojects/ch32v10x @@ -1 +1 @@ -Subproject commit 6c6fa38d8912e46e56ffab728ab748b45284314f +Subproject commit 99e395ebc54178088aa9a7a0a789f960c76ae19b diff --git a/subprojects/ch32v30x b/subprojects/ch32v30x index 8d8a376..2584333 160000 --- a/subprojects/ch32v30x +++ b/subprojects/ch32v30x @@ -1 +1 @@ -Subproject commit 8d8a376858f6e27a6a229762f1406dc9bf85a555 +Subproject commit 2584333367296569661239d28638a2817e8f9ec8