From 3c81186daf97cf7011fd2806dfd0bc3b875e92f3 Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
Date: Thu, 31 Oct 2024 15:39:37 -0600
Subject: Clean up the build system

---
 .editorconfig                     |   4 +-
 .gitignore                        |   5 +-
 3rd-party/linux-errno.txt         |   2 +-
 3rd-party/linux-errno.txt.gen     |  14 ---
 CMakeLists.txt                    |  48 +++++++++-
 GNUmakefile                       | 146 ++++++++++++++++++++++++++++++
 Makefile                          | 139 ----------------------------
 build-aux/embed-sources.h.gen     |  10 +++
 build-aux/linux-errno.txt.gen     |  17 ++++
 build-aux/stack.c.gen             |   9 ++
 build-aux/stack.py                | 184 ++++++++++++++++++++++++++++++++++++++
 build-aux/stack.sh                |   2 +
 cmd/sbc_harness/CMakeLists.txt    |  16 +---
 cmd/srv9p/CMakeLists.txt          |  38 +-------
 cmd/srv9p/static.h.gen            |  10 ---
 lib9p/include/lib9p/linux-errno.h |   4 +-
 pico_sdk_import.cmake             |   1 -
 stack.py                          | 184 --------------------------------------
 stack.sh                          |   2 -
 19 files changed, 428 insertions(+), 407 deletions(-)
 delete mode 100755 3rd-party/linux-errno.txt.gen
 create mode 100644 GNUmakefile
 delete mode 100644 Makefile
 create mode 100755 build-aux/embed-sources.h.gen
 create mode 100755 build-aux/linux-errno.txt.gen
 create mode 100755 build-aux/stack.c.gen
 create mode 100644 build-aux/stack.py
 create mode 100755 build-aux/stack.sh
 delete mode 100755 cmd/srv9p/static.h.gen
 delete mode 120000 pico_sdk_import.cmake
 delete mode 100644 stack.py
 delete mode 100755 stack.sh

diff --git a/.editorconfig b/.editorconfig
index b2ffbdd..e44781e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -30,10 +30,10 @@ _mode = markdown
 [*.9p{,.wip}]
 _mode = 9p
 
-[{3rd-party/linux-errno.txt.gen,cmd/srv9p/static.h.gen}]
+[cmd/srv9p/static.h.gen]
 _mode = sh
 
-[libusb/include/libusb/tusb_helpers.h.gen]
+[{build-aux/linux-errno.txt.gen,libusb/include/libusb/tusb_helpers.h.gen}]
 _mode = bash
 
 [{lib9p/idl.gen,lib9p/include/lib9p/linux-errno.h.gen,stack.py}]
diff --git a/.gitignore b/.gitignore
index 4e3ccaa..ee30cb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,5 @@
 *.tmp
 .mypy_cache/
 
-build/
-
-/.sources.mk
+/build/
+/build-aux/sources.mk
diff --git a/3rd-party/linux-errno.txt b/3rd-party/linux-errno.txt
index d2f6585..839efc2 100644
--- a/3rd-party/linux-errno.txt
+++ b/3rd-party/linux-errno.txt
@@ -1,4 +1,4 @@
-# ./3rd-party/linux-errno.txt - Generated from linux.git v6.7.  DO NOT EDIT!
+# 3rd-party/linux-errno.txt - Generated from build-aux/linux-errno.txt.gen and linux.git v6.7.  DO NOT EDIT!
 1 EPERM Operation not permitted
 2 ENOENT No such file or directory
 3 ESRCH No such process
diff --git a/3rd-party/linux-errno.txt.gen b/3rd-party/linux-errno.txt.gen
deleted file mode 100755
index abfbe95..0000000
--- a/3rd-party/linux-errno.txt.gen
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# 3rd-party/linux-errno.txt.gen - Generate a listing of Linux kernel errnos
-#
-# Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-set -e
-(
-	cd "$1"
-	echo "# ${0%.gen} - Generated from linux.git $(git describe).  DO NOT EDIT!"
-	git ls-files include/uapi/ | grep errno |
-		xargs sed -nE 's,#\s*define\s+(E[A-Z0-9]+)\s+([0-9]+)\s+/\* (.*) \*/,\2 \1 \3,p' |
-		sort --numeric-sort
-) >"${0%.gen}"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6655b0a..100214c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,11 +6,11 @@
 cmake_minimum_required(VERSION 3.30)
 
 if (NOT PICO_PLATFORM)
-        message(FATAL_ERROR "PICO_PLATFORM must be specified")
+        message(FATAL_ERROR "PICO_PLATFORM must be specified; use the GNUmakefile to set this")
 endif()
 
 set(PICO_SDK_PATH "${CMAKE_SOURCE_DIR}/3rd-party/pico-sdk")
-include(pico_sdk_import.cmake)
+include("${PICO_SDK_PATH}/external/pico_sdk_import.cmake")
 
 project(sbc_harness)
 
@@ -18,6 +18,50 @@ pico_sdk_init()
 
 add_compile_options(-Wall -Wextra -Werror)
 
+function(target_embed_sources arg_target arg_hdrname)
+	set(embed_objs)
+	foreach(embed_src IN LISTS ARGN)
+		add_custom_command(
+			OUTPUT            "${embed_src}.obj"
+			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+			COMMAND           mkdir -p -- "$<PATH:GET_PARENT_PATH,${CMAKE_CURRENT_BINARY_DIR}/${embed_src}>" &&
+				${CMAKE_LINKER} -r -b binary -o "${CMAKE_CURRENT_BINARY_DIR}/${embed_src}.obj" "${embed_src}"
+			DEPENDS           "${embed_src}"
+		)
+		list(APPEND embed_objs "${embed_src}.obj")
+	endforeach()
+	set_source_files_properties("${embed_objs}" PROPERTIES
+		EXTERNAL_OBJECT true
+		GENERATED true
+	)
+
+	set_source_files_properties("${arg_hdrname}" PROPERTIES
+		GENERATED true
+	)
+	add_custom_command(
+		OUTPUT  "${arg_hdrname}"
+		COMMAND "${CMAKE_SOURCE_DIR}/build-aux/embed-sources.h.gen" "${embed_objs}" >"${arg_hdrname}"
+		COMMAND_EXPAND_LISTS
+		DEPENDS "${embed_objs}" "${CMAKE_SOURCE_DIR}/build-aux/embed-sources.h.gen"
+	)
+
+	target_sources("${arg_target}" PRIVATE "${embed_objs}" "${arg_hdrname}")
+endfunction()
+
+function(add_stack_analysis arg_outfile arg_objlib_target)
+	target_compile_options("${arg_objlib_target}" PUBLIC "-fcallgraph-info=su,da")
+	set_source_files_properties("${arg_outfile}" PROPERTIES
+		GENERATED true
+	)
+	add_custom_command(
+		OUTPUT  "${arg_outfile}"
+		COMMAND "${CMAKE_SOURCE_DIR}/build-aux/stack.c.gen" "$<TARGET_OBJECTS:${arg_objlib_target}>" >"${arg_outfile}"
+		COMMAND_EXPAND_LISTS
+		DEPENDS "$<TARGET_OBJECTS:${arg_objlib_target}>" "${CMAKE_SOURCE_DIR}/build-aux/stack.c.gen"
+		COMMENT "Calculating ${arg_objlib_target} required stack sizes"
+	)
+endfunction()
+
 add_subdirectory(libcr)
 add_subdirectory(libcr_ipc)
 add_subdirectory(libmisc)
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 0000000..28f287a
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,146 @@
+# GNUmakefile - Main build script for sbc-harness project
+#
+# Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# Project configuration ########################################################
+
+linux.git = $(HOME)/src/github.com/torvalds/linux
+
+all: build
+.PHONY: all
+
+# Configure GNU Make itself ####################################################
+
+ifeq ($(filter notintermediate,$(.FEATURES)),)
+$(error This $(firstword $(MAKEFILE_LIST)) requies GNU Make 4.4 or later for .NOTINTERMEDIATE)
+endif
+
+.NOTINTERMEDIATE:
+.DELETE_ON_ERROR:
+
+.PHONY: FORCE
+
+# `generate` ###################################################################
+
+generate/files =
+
+generate/files += 3rd-party/linux-errno.txt
+3rd-party/linux-errno.txt: build-aux/linux-errno.txt.gen
+	$< $(linux.git) $@
+
+generate/files += lib9p/include/lib9p/linux-errno.h
+lib9p/include/lib9p/linux-errno.h: %: %.gen 3rd-party/linux-errno.txt
+	$^ >$@
+
+generate/files += lib9p/9p.generated.c lib9p/include/lib9p/9p.generated.h
+lib9p/9p.generated.c lib9p/include/lib9p/9p.generated.h &: lib9p/idl.gen lib9p/idl/*.9p
+	$^
+
+generate/files += libusb/include/libusb/tusb_helpers.h 3rd-party/MS-LCID.pdf 3rd-party/MS-LCID.txt
+libusb/include/libusb/tusb_helpers.h 3rd-party/MS-LCID.pdf 3rd-party/MS-LCID.txt &: libusb/include/libusb/tusb_helpers.h.gen
+	$^
+
+generate/files += build-aux/sources.mk
+build-aux/sources.mk: $(if $(wildcard .git),FORCE)
+	git ls-files | grep -vFx $(foreach f,$(generate/files),-e $f) \
+	| sed 's,^,$(CURDIR)/,' | xargs editorconfig                  \
+	| sed -nE -e 's,\[$(CURDIR)/(.*)\],\1,p' -e 's/^_mode=//p'    \
+	| sed -E '{N;s/(.*)\n(.*)/sources_\2 += \1/;}'                \
+	| sort                                                        \
+	>$@.tmp
+	if ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi
+
+generate: $(generate/files)
+.PHONY: generate
+
+generate-clean:
+	rm -f -- $(generate/files)
+.PHONY: generate-clean
+
+# `build` ######################################################################
+
+platforms := $(shell sed -nE 's/if *\(PICO_PLATFORM STREQUAL "(.*)"\)/\1/p' cmd/*/CMakeLists.txt)
+
+build: $(foreach p,$(platforms),build/$p/build)
+.PHONY: build
+
+$(foreach p,$(platforms),build/$p/Makefile): build/%/Makefile:
+	mkdir -p $(@D) && cd $(@D) && cmake -DCMAKE_BUILD_TYPE=Debug -DPICO_PLATFORM=$* ../..
+
+$(foreach p,$(platforms),build/$p/build): build/%/build: build/%/Makefile generate
+	$(MAKE) -C $(<D)
+.PHONY: $(foreach p,$(platforms),build/$p/build)
+
+# `lint` and `format` ##########################################################
+
+-include build-aux/sources.mk
+
+get_dscname = sed -n '1,3{ /^\#!/d; /^<!--$$/d; /-\*- .* -\*-/d; s,[/*\# ]*,,; s/ - .*//;p; q; }'
+
+# `lint` ###########
+lint:
+	$(MAKE) -k $(patsubst sources_%,lint/%,$(filter sources_%,$(.VARIABLES)))
+lint/sh lint/bash: lint/%:
+	shellcheck $(sources_$*)
+lint/python3: lint/%:
+	mypy --strict --scripts-are-modules $(sources_$*)
+	black --check $(sources_$*)
+	isort --check $(sources_$*)
+lint/c: lint/%:
+	@for filename in $(filter %.h,$(sources_$*)); do \
+	    dscname=$$($(get_dscname) $$filename); \
+	    guard=$${dscname//'/'/'_'}; \
+	    guard=$${guard//'.'/'_'}; \
+	    guard="_$${guard^^}_"; \
+	    if ! { grep -Fxq "#ifndef $${guard}"      "$$filename" && \
+	           grep -Fxq "#define $${guard}"      "$$filename" && \
+	           grep -Fxq "#endif /* $${guard} */" "$$filename"; }; then \
+	        echo "$$filename does not have $${guard} guard"; r=1; \
+	    fi; \
+	done
+lint/make lint/cmake lint/gitignore lint/ini lint/9p lint/markdown: lint/%:
+	@:
+lint/unknown: lint/%:
+	@printf "%s: cannot lint unknown file type\n" $(sources_$*) >&2
+lint/all: lint/%:
+	$(eval export sources_$*)
+	@find $$(printf '%s\n' $${sources_$*} | grep -vE '^cmd/[^/]+/static/') \
+	    -maxdepth 0 -type f | \
+	{ r=0; while read -r filename; do \
+	    if ! grep -q 'Copyright (C) 2024  Luke T. Shumaker' $$filename; then \
+	        echo "$$filename is missing a copyright statement"; r=1; \
+	    fi; \
+	    if ! grep -q ' SPDX-License-Identifier[:] ' $$filename; then \
+	        echo "$$filename is missing an SPDX-License-Identifier"; r=1; \
+	    fi; \
+	    dscname_act=$$($(get_dscname) $$filename); \
+	    dscname_exp=$$(echo "$$filename" | sed \
+	        -e 's,.*/config/,,' \
+	        -e 's,.*include/,,' \
+	        -e 's,^lib9p/idl/,,' \
+	        -e 's/\.wip$$//'); \
+	    if [ "$$dscname_act" != "$$dscname_exp" ] && [ "cmd/$$dscname_act" != "$$dscname_exp" ]; then \
+	        echo "$$filename self-identifies as $$dscname_act (expected $$dscname_exp)"; r=1; \
+	    fi; \
+	    if grep -n --color=auto "$$(printf '\\S\t')" $$filename; then \
+	        echo "$$filename uses tabs for alignment"; r=1; \
+	    fi; \
+	done; exit $$r; }
+.PHONY: lint lint/%
+
+# `format` #########
+format:
+	$(MAKE) -k $(patsubst sources_%,format/%,$(filter-out sources_all,$(filter sources_%,$(.VARIABLES))))
+format/python3: format/%:
+	black $(sources_$*)
+	isort $(sources_$*)
+format/sh format/bash: format/%
+	@:
+format/c: format/%:
+	@: TODO
+format/make format/cmake format/gitignore format/ini format/9p format/markdown: format/%:
+	@:
+format/unknown: format/%:
+	@:
+.PHONY: format format/%
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 26ce8ba..0000000
--- a/Makefile
+++ /dev/null
@@ -1,139 +0,0 @@
-# Makefile - Main build script for sbc-harness project
-#
-# Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-linux.git = $(HOME)/src/github.com/torvalds/linux
-
-all: build
-.PHONY: all
-
-.NOTINTERMEDIATE:
-.DELETE_ON_ERROR:
-
-################################################################################
-
-generate/files =
-
-generate/files += 3rd-party/linux-errno.txt
-3rd-party/linux-errno.txt: %: %.gen
-	./$< $(linux.git)
-
-generate/files += lib9p/include/lib9p/linux-errno.h
-lib9p/include/lib9p/linux-errno.h: %: %.gen 3rd-party/linux-errno.txt
-	./$^ >$@
-
-generate/files += lib9p/9p.generated.c lib9p/include/lib9p/9p.generated.h
-lib9p/9p.generated.c lib9p/include/lib9p/9p.generated.h &: lib9p/idl.gen lib9p/idl/*.9p
-	./$^
-
-generate/files += libusb/include/libusb/tusb_helpers.h 3rd-party/MS-LCID.pdf 3rd-party/MS-LCID.txt
-libusb/include/libusb/tusb_helpers.h 3rd-party/MS-LCID.pdf 3rd-party/MS-LCID.txt &: libusb/include/libusb/tusb_helpers.h.gen
-	./$^
-
-################################################################################
-
-platforms := $(shell sed -nE 's/if *\(PICO_PLATFORM STREQUAL "(.*)"\)/\1/p' cmd/*/CMakeLists.txt)
-
-build: $(foreach p,$(platforms),build/$p/build)
-.PHONY: build
-
-$(foreach p,$(platforms),build/$p/Makefile): build/%/Makefile:
-	mkdir -p $(@D) && cd $(@D) && cmake -DCMAKE_BUILD_TYPE=Debug -DPICO_PLATFORM=$* ../..
-
-$(foreach p,$(platforms),build/$p/build): build/%/build: build/%/Makefile
-	$(MAKE) -C $(<D)
-.PHONY: $(foreach p,$(platforms),build/$p/build)
-
-generate: $(generate/files)
-.PHONY: generate
-
-generate-clean:
-	rm -f -- $(generate/files)
-.PHONY: generate-clean
-
-################################################################################
-
-.PHONY: FORCE
-
-# List of sources, by type.
-.sources.mk: $(if $(wildcard .git),FORCE)
-	git ls-files | grep -vFx $(foreach f,$(generate/files),-e $f) \
-	| sed 's,^,$(CURDIR)/,' | xargs editorconfig                  \
-	| sed -nE -e 's,\[$(CURDIR)/(.*)\],\1,p' -e 's/^_mode=//p'    \
-	| sed -E '{N;s/(.*)\n(.*)/sources_\2 += \1/;}'                \
-	| sort                                                        \
-	>$@.tmp
-	if ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi
--include .sources.mk
-sources_all := $(foreach v,$(filter sources_%,$(.VARIABLES)),$($v))
-
-# lint #############
-
-get_dscname = sed -n '1,3{ /^\#!/d; /^<!--$$/d; /-\*- .* -\*-/d; s,[/*\# ]*,,; s/ - .*//;p; q; }'
-
-lint:
-	$(MAKE) -k $(patsubst sources_%,lint/%,$(filter sources_%,$(.VARIABLES)))
-lint/sh lint/bash: lint/%:
-	shellcheck $(sources_$*)
-lint/python3: lint/%:
-	mypy --strict --scripts-are-modules $(sources_$*)
-	black --check $(sources_$*)
-	isort --check $(sources_$*)
-lint/c: lint/%:
-	@for filename in $(filter %.h,$(sources_$*)); do \
-	    dscname=$$($(get_dscname) $$filename); \
-	    guard=$${dscname//'/'/'_'}; \
-	    guard=$${guard//'.'/'_'}; \
-	    guard="_$${guard^^}_"; \
-	    if ! { grep -Fxq "#ifndef $${guard}"      "$$filename" && \
-	           grep -Fxq "#define $${guard}"      "$$filename" && \
-	           grep -Fxq "#endif /* $${guard} */" "$$filename"; }; then \
-	        echo "$$filename does not have $${guard} guard"; r=1; \
-	    fi; \
-	done
-lint/make lint/cmake lint/gitignore lint/ini lint/9p lint/markdown: lint/%:
-	@:
-lint/unknown: lint/%:
-	@printf "%s: cannot lint unknown file type\n" $(sources_$*) >&2
-lint/all: lint/%:
-	$(eval export sources_$*)
-	@find $$(printf '%s\n' $${sources_$*} | grep -vE '^cmd/[^/]+/static/') \
-	    -maxdepth 0 -type f | \
-	{ r=0; while read -r filename; do \
-	    if ! grep -q 'Copyright (C) 2024  Luke T. Shumaker' $$filename; then \
-	        echo "$$filename is missing a copyright statement"; r=1; \
-	    fi; \
-	    if ! grep -q ' SPDX-License-Identifier[:] ' $$filename; then \
-	        echo "$$filename is missing an SPDX-License-Identifier"; r=1; \
-	    fi; \
-	    dscname_act=$$($(get_dscname) $$filename); \
-	    dscname_exp=$$(echo "$$filename" | sed \
-	        -e 's,.*/config/,,' \
-	        -e 's,.*include/,,' \
-	        -e 's,^lib9p/idl/,,' \
-	        -e 's/\.wip$$//'); \
-	    if [ "$$dscname_act" != "$$dscname_exp" ] && [ "cmd/$$dscname_act" != "$$dscname_exp" ]; then \
-	        echo "$$filename self-identifies as $$dscname_act (expected $$dscname_exp)"; r=1; \
-	    fi; \
-	    if grep -n --color=auto "$$(printf '\\S\t')" $$filename; then \
-	        echo "$$filename uses tabs for alignment"; r=1; \
-	    fi; \
-	done; exit $$r; }
-.PHONY: lint lint/%
-
-# format ###########
-format:
-	$(MAKE) -k $(patsubst sources_%,format/%,$(filter-out sources_all,$(filter sources_%,$(.VARIABLES))))
-format/python3: format/%:
-	black $(sources_$*)
-	isort $(sources_$*)
-format/sh format/bash: format/%
-	@:
-format/c: format/%:
-	@: TODO
-format/make format/cmake format/gitignore format/ini format/9p format/markdown: format/%:
-	@:
-format/unknown: format/%:
-	@:
-.PHONY: format format/%
diff --git a/build-aux/embed-sources.h.gen b/build-aux/embed-sources.h.gen
new file mode 100755
index 0000000..0ba6457
--- /dev/null
+++ b/build-aux/embed-sources.h.gen
@@ -0,0 +1,10 @@
+#!/bin/sh
+# embed-sources.h.gen - Generate C definitions for GNU `ld -r -b binary` files
+#
+# Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+nm --format=posix "$@" |
+	sed -n -E \
+	    -e 's/(.*_(end|start)) D .*/extern char \1[];/p' \
+	    -e 's/(.*_size) A .*/extern size_t \1;/p'
diff --git a/build-aux/linux-errno.txt.gen b/build-aux/linux-errno.txt.gen
new file mode 100755
index 0000000..f94178f
--- /dev/null
+++ b/build-aux/linux-errno.txt.gen
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# build-aux/linux-errno.txt.gen - Generate a listing of Linux kernel errnos
+#
+# Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+set -e
+linux_git=${1:?}
+outfile=${2:?}
+
+(
+	cd "${linux_git}"
+	echo "# ${outfile} - Generated from $0 and linux.git $(git describe).  DO NOT EDIT!"
+	git ls-files include/uapi/ | grep errno |
+		xargs sed -nE 's,#\s*define\s+(E[A-Z0-9]+)\s+([0-9]+)\s+/\* (.*) \*/,\2 \1 \3,p' |
+		sort --numeric-sort
+) >"${outfile}"
diff --git a/build-aux/stack.c.gen b/build-aux/stack.c.gen
new file mode 100755
index 0000000..9325791
--- /dev/null
+++ b/build-aux/stack.c.gen
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# stack.c.gen - Analyze stack sizes for compiled objects
+#
+# Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+for obj in "$@"; do
+	echo "// $obj"
+done
diff --git a/build-aux/stack.py b/build-aux/stack.py
new file mode 100644
index 0000000..c1e36d3
--- /dev/null
+++ b/build-aux/stack.py
@@ -0,0 +1,184 @@
+#!/usr/bin/env python3
+import re
+import sys
+import typing
+
+# Parse the "VCG" language
+#
+# https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1.html
+#
+# The formal syntax is found at
+# ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/vcg.tgz `doc/grammar.txt`.
+
+
+class VCGElem:
+    typ: str
+    lineno: int
+    attrs: dict[str, str]
+
+
+def parse_vcg(reader: typing.TextIO) -> typing.Iterator[VCGElem]:
+    re_beg = re.compile(r"(edge|node):\s*\{\s*")
+    _re_tok = r"[a-zA-Z_][a-zA-Z0-9_]*"
+    _re_str = r'"(?:[^\"]|\\.)*"'
+    re_attr = re.compile(
+        "(" + _re_tok + r")\s*:\s*(" + _re_tok + "|" + _re_str + r")\s*"
+    )
+    re_end = re.compile(r"\}\s*$")
+    re_skip = re.compile(r"(graph:\s*\{\s*title\s*:\s*" + _re_str + r"\s*|\})\s*")
+    re_esc = re.compile(r"\\.")
+
+    for lineno, line in enumerate(reader):
+        pos = 0
+
+        def _raise(msg: str) -> typing.NoReturn:
+            nonlocal lineno
+            nonlocal line
+            nonlocal pos
+            e = SyntaxError(msg)
+            e.lineno = lineno
+            e.offset = pos
+            e.text = line
+            raise e
+
+        if re_skip.fullmatch(line):
+            continue
+
+        elem = VCGElem()
+        elem.lineno = lineno
+
+        m = re_beg.match(line, pos=pos)
+        if not m:
+            _raise("does not look like a VCG line")
+        elem.typ = m.group(1)
+        pos = m.end()
+
+        elem.attrs = {}
+        while True:
+            if re_end.match(line, pos=pos):
+                break
+            m = re_attr.match(line, pos=pos)
+            if not m:
+                _raise("unexpected character")
+            k = m.group(1)
+            v = m.group(2)
+            if k in elem.attrs:
+                _raise(f"duplicate key: {repr(k)}")
+            if v.startswith('"'):
+
+                def unesc(esc: re.Match[str]) -> str:
+                    match esc.group(0)[1:]:
+                        case "n":
+                            return "\n"
+                        case '"':
+                            return '"'
+                        case "\\":
+                            return "\\"
+                        case _:
+                            _raise(f"invalid escape code {repr(esc.group(0))}")
+
+                v = re_esc.sub(unesc, v[1:-1])
+            elem.attrs[k] = v
+            pos = m.end()
+
+        yield elem
+
+
+class Node:
+    # from .title (`static` functions are prefixed with the
+    # compilation unit .c file, which is fine, we'll just leave it).
+    funcname: str
+    # .label is "{funcname}\n{location}\n{nstatic} bytes (static}\n{ndynamic} dynamic objects"
+    location: str
+    nstatic: int
+    ndynamic: int
+
+    # edges with .sourcename set to this node
+    calls: set[str]
+
+def main() -> None:
+    re_label = re.compile(
+        r"(?P<funcname>[^\n]+)\n"
+        + r"(?P<location>[^\n]+:[0-9]+:[0-9]+)\n"
+        + r"(?P<nstatic>[0-9]+) bytes \(static\)\n"
+        + r"(?P<ndynamic>[0-9]+) dynamic objects",
+        flags=re.MULTILINE,
+    )
+
+    graph: dict[str, Node] = dict()
+
+    for elem in parse_vcg(sys.stdin):
+        match elem.typ:
+            case "node":
+                node = Node()
+                node.calls = set()
+                skip = False
+                for k, v in elem.attrs.items():
+                    match k:
+                        case "title":
+                            node.funcname = v
+                        case "label":
+                            if elem.attrs.get("shape", "") != "ellipse":
+                                m = re_label.fullmatch(v)
+                                if not m:
+                                    raise ValueError(
+                                        f"unexpected label value {repr(v)}"
+                                    )
+                                node.location = m.group("location")
+                                node.nstatic = int(m.group("nstatic"))
+                                node.ndynamic = int(m.group("ndynamic"))
+                        case "shape":
+                            if v != "ellipse":
+                                raise ValueError(f"unexpected shape value {repr(v)}")
+                            skip = True
+                        case _:
+                            raise ValueError(f"unknown edge key {repr(k)}")
+                if not skip:
+                    if node.funcname in graph:
+                        raise ValueError(f"duplicate node {repr(node.funcname)}")
+                    graph[node.funcname] = node
+            case "edge":
+                caller: str | None = None
+                callee: str | None = None
+                for k, v in elem.attrs.items():
+                    match k:
+                        case "sourcename":
+                            caller = v
+                        case "targetname":
+                            callee = v
+                        case "label":
+                            pass
+                        case _:
+                            raise ValueError(f"unknown edge key {repr(k)}")
+                if caller is None or callee is None:
+                    raise ValueError(f"incomplete edge: {repr(elem.attrs)}")
+                if caller not in graph:
+                    raise ValueError(f"unknown caller: {caller}")
+                graph[caller].calls.add(callee)
+            case _:
+                raise ValueError(f"unknown elem type {repr(elem.typ)}")
+
+    # x
+
+    missing: set[str] = set()
+    def nstatic(funcname: str) -> int:
+        if funcname not in graph:
+            missing.add(funcname)
+            return 0
+        node = graph[funcname]
+        return node.nstatic + max([0, *[nstatic(call) for call in node.calls]])
+
+    namelen = max(len(name) for name in graph if name.endswith("_cr"))
+    print(("="*namelen)+" =======")
+
+    for funcname in graph:
+        if funcname.endswith("_cr"):
+            print(f"{funcname}\t{nstatic(funcname)}")
+
+    print(("="*namelen)+" =======")
+
+    for funcname in sorted(missing):
+        print(f"{funcname}\tmissing")
+
+if __name__ == "__main__":
+    main()
diff --git a/build-aux/stack.sh b/build-aux/stack.sh
new file mode 100755
index 0000000..4a8a12e
--- /dev/null
+++ b/build-aux/stack.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+make >&2 && find build -name '*.ci' -exec cat -- {} + | python ./stack.py
diff --git a/cmd/sbc_harness/CMakeLists.txt b/cmd/sbc_harness/CMakeLists.txt
index 85e61ab..2018cf7 100644
--- a/cmd/sbc_harness/CMakeLists.txt
+++ b/cmd/sbc_harness/CMakeLists.txt
@@ -5,7 +5,7 @@
 
 if (PICO_PLATFORM STREQUAL "rp2040")
 
-# Main compilation #############################################################
+# Compile ######################################################################
 
 add_library(sbc_harness_objs
 	main.c
@@ -27,19 +27,9 @@ pico_enable_stdio_uart(sbc_harness_objs 1)
 pico_enable_stdio_semihosting(sbc_harness_objs 0)
 pico_enable_stdio_rtt(sbc_harness_objs 0)
 
-# Stack analysis ###############################################################
+# Analyze the stack ############################################################
 
-target_compile_options(sbc_harness_objs PUBLIC "-fcallgraph-info=su,da")
-set_source_files_properties(sbc_harness_stack.c PROPERTIES
-	GENERATED true
-)
-add_custom_command(
-	OUTPUT sbc_harness_stack.c
-	COMMAND set -o pipefail && cat -- "$<LIST:TRANSFORM,$<LIST:FILTER,$<TARGET_OBJECTS:sbc_harness_objs>,INCLUDE,\.c\.o(bj)?$>,REPLACE,\.o(bj)?$,.ci>" | sed 's,^,//,' >sbc_harness_stack.c
-	COMMAND_EXPAND_LISTS
-	DEPENDS $<TARGET_OBJECTS:sbc_harness_objs>
-	COMMENT "Calculating sbc_harness required stack sizes"
-)
+add_stack_analysis(sbc_harness_stack.c sbc_harness_objs)
 
 # Link #########################################################################
 
diff --git a/cmd/srv9p/CMakeLists.txt b/cmd/srv9p/CMakeLists.txt
index 4c170fb..b747882 100644
--- a/cmd/srv9p/CMakeLists.txt
+++ b/cmd/srv9p/CMakeLists.txt
@@ -5,15 +5,14 @@
 
 if (PICO_PLATFORM STREQUAL "host")
 
-set(static_srcs
-	static/README.md
-	static/Documentation/x
-)
-
 add_executable(srv9p
 	main.c
 	static9p.c
 )
+target_embed_sources(srv9p static.h
+	static/README.md
+	static/Documentation/x
+)
 target_include_directories(srv9p PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 target_include_directories(srv9p PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
 target_link_libraries(srv9p
@@ -23,33 +22,4 @@ target_link_libraries(srv9p
 	lib9p
 )
 
-set(static_objs)
-foreach(static_src ${static_srcs})
-	add_custom_command(
-		OUTPUT "${static_src}.obj"
-		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-		COMMAND dirname -- ${CMAKE_CURRENT_BINARY_DIR}/${static_src}.obj | xargs mkdir -p --
-		COMMAND ${CMAKE_LINKER} -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/${static_src}.obj ${static_src}
-		DEPENDS "${static_src}"
-	)
-	list(APPEND static_objs "${static_src}.obj")
-endforeach()
-
-set_source_files_properties(${static_objs} PROPERTIES
-	EXTERNAL_OBJECT true
-	GENERATED true
-)
-
-set_source_files_properties(static.h PROPERTIES
-	GENERATED true
-)
-
-add_custom_command(
-	OUTPUT static.h
-	DEPENDS ${static_objs} static.h.gen
-	COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/static.h.gen ${static_objs} >static.h
-)
-
-target_sources(srv9p PRIVATE ${static_objs} static.h)
-
 endif()
diff --git a/cmd/srv9p/static.h.gen b/cmd/srv9p/static.h.gen
deleted file mode 100755
index a93419f..0000000
--- a/cmd/srv9p/static.h.gen
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# srv9p/static.h.gen - Generate C definitions for GNU `ld -r -b binary` files
-#
-# Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-nm --format=posix "$@" |
-	sed -n -E \
-	    -e 's/(.*_(end|start)) D .*/extern char \1[];/p' \
-	    -e 's/(.*_size) A .*/extern size_t \1;/p'
diff --git a/lib9p/include/lib9p/linux-errno.h b/lib9p/include/lib9p/linux-errno.h
index 160b88b..e7c74f5 100644
--- a/lib9p/include/lib9p/linux-errno.h
+++ b/lib9p/include/lib9p/linux-errno.h
@@ -1,5 +1,5 @@
-/* lib9p/linux-errno.h - Generated by `./lib9p/include/lib9p/linux-errno.h.gen 3rd-party/linux-errno.txt`.  DO NOT EDIT!  */
-/* ./3rd-party/linux-errno.txt - Generated from linux.git v6.7.  DO NOT EDIT!  */
+/* lib9p/linux-errno.h - Generated by `lib9p/include/lib9p/linux-errno.h.gen 3rd-party/linux-errno.txt`.  DO NOT EDIT!  */
+/* 3rd-party/linux-errno.txt - Generated from build-aux/linux-errno.txt.gen and linux.git v6.7.  DO NOT EDIT!  */
 
 #ifndef _LIB9P_LINUX_ERRNO_H_
 #define _LIB9P_LINUX_ERRNO_H_
diff --git a/pico_sdk_import.cmake b/pico_sdk_import.cmake
deleted file mode 120000
index d34d145..0000000
--- a/pico_sdk_import.cmake
+++ /dev/null
@@ -1 +0,0 @@
-3rd-party/pico-sdk/external/pico_sdk_import.cmake
\ No newline at end of file
diff --git a/stack.py b/stack.py
deleted file mode 100644
index c1e36d3..0000000
--- a/stack.py
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env python3
-import re
-import sys
-import typing
-
-# Parse the "VCG" language
-#
-# https://www.rw.cdl.uni-saarland.de/people/sander/private/html/gsvcg1.html
-#
-# The formal syntax is found at
-# ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/vcg.tgz `doc/grammar.txt`.
-
-
-class VCGElem:
-    typ: str
-    lineno: int
-    attrs: dict[str, str]
-
-
-def parse_vcg(reader: typing.TextIO) -> typing.Iterator[VCGElem]:
-    re_beg = re.compile(r"(edge|node):\s*\{\s*")
-    _re_tok = r"[a-zA-Z_][a-zA-Z0-9_]*"
-    _re_str = r'"(?:[^\"]|\\.)*"'
-    re_attr = re.compile(
-        "(" + _re_tok + r")\s*:\s*(" + _re_tok + "|" + _re_str + r")\s*"
-    )
-    re_end = re.compile(r"\}\s*$")
-    re_skip = re.compile(r"(graph:\s*\{\s*title\s*:\s*" + _re_str + r"\s*|\})\s*")
-    re_esc = re.compile(r"\\.")
-
-    for lineno, line in enumerate(reader):
-        pos = 0
-
-        def _raise(msg: str) -> typing.NoReturn:
-            nonlocal lineno
-            nonlocal line
-            nonlocal pos
-            e = SyntaxError(msg)
-            e.lineno = lineno
-            e.offset = pos
-            e.text = line
-            raise e
-
-        if re_skip.fullmatch(line):
-            continue
-
-        elem = VCGElem()
-        elem.lineno = lineno
-
-        m = re_beg.match(line, pos=pos)
-        if not m:
-            _raise("does not look like a VCG line")
-        elem.typ = m.group(1)
-        pos = m.end()
-
-        elem.attrs = {}
-        while True:
-            if re_end.match(line, pos=pos):
-                break
-            m = re_attr.match(line, pos=pos)
-            if not m:
-                _raise("unexpected character")
-            k = m.group(1)
-            v = m.group(2)
-            if k in elem.attrs:
-                _raise(f"duplicate key: {repr(k)}")
-            if v.startswith('"'):
-
-                def unesc(esc: re.Match[str]) -> str:
-                    match esc.group(0)[1:]:
-                        case "n":
-                            return "\n"
-                        case '"':
-                            return '"'
-                        case "\\":
-                            return "\\"
-                        case _:
-                            _raise(f"invalid escape code {repr(esc.group(0))}")
-
-                v = re_esc.sub(unesc, v[1:-1])
-            elem.attrs[k] = v
-            pos = m.end()
-
-        yield elem
-
-
-class Node:
-    # from .title (`static` functions are prefixed with the
-    # compilation unit .c file, which is fine, we'll just leave it).
-    funcname: str
-    # .label is "{funcname}\n{location}\n{nstatic} bytes (static}\n{ndynamic} dynamic objects"
-    location: str
-    nstatic: int
-    ndynamic: int
-
-    # edges with .sourcename set to this node
-    calls: set[str]
-
-def main() -> None:
-    re_label = re.compile(
-        r"(?P<funcname>[^\n]+)\n"
-        + r"(?P<location>[^\n]+:[0-9]+:[0-9]+)\n"
-        + r"(?P<nstatic>[0-9]+) bytes \(static\)\n"
-        + r"(?P<ndynamic>[0-9]+) dynamic objects",
-        flags=re.MULTILINE,
-    )
-
-    graph: dict[str, Node] = dict()
-
-    for elem in parse_vcg(sys.stdin):
-        match elem.typ:
-            case "node":
-                node = Node()
-                node.calls = set()
-                skip = False
-                for k, v in elem.attrs.items():
-                    match k:
-                        case "title":
-                            node.funcname = v
-                        case "label":
-                            if elem.attrs.get("shape", "") != "ellipse":
-                                m = re_label.fullmatch(v)
-                                if not m:
-                                    raise ValueError(
-                                        f"unexpected label value {repr(v)}"
-                                    )
-                                node.location = m.group("location")
-                                node.nstatic = int(m.group("nstatic"))
-                                node.ndynamic = int(m.group("ndynamic"))
-                        case "shape":
-                            if v != "ellipse":
-                                raise ValueError(f"unexpected shape value {repr(v)}")
-                            skip = True
-                        case _:
-                            raise ValueError(f"unknown edge key {repr(k)}")
-                if not skip:
-                    if node.funcname in graph:
-                        raise ValueError(f"duplicate node {repr(node.funcname)}")
-                    graph[node.funcname] = node
-            case "edge":
-                caller: str | None = None
-                callee: str | None = None
-                for k, v in elem.attrs.items():
-                    match k:
-                        case "sourcename":
-                            caller = v
-                        case "targetname":
-                            callee = v
-                        case "label":
-                            pass
-                        case _:
-                            raise ValueError(f"unknown edge key {repr(k)}")
-                if caller is None or callee is None:
-                    raise ValueError(f"incomplete edge: {repr(elem.attrs)}")
-                if caller not in graph:
-                    raise ValueError(f"unknown caller: {caller}")
-                graph[caller].calls.add(callee)
-            case _:
-                raise ValueError(f"unknown elem type {repr(elem.typ)}")
-
-    # x
-
-    missing: set[str] = set()
-    def nstatic(funcname: str) -> int:
-        if funcname not in graph:
-            missing.add(funcname)
-            return 0
-        node = graph[funcname]
-        return node.nstatic + max([0, *[nstatic(call) for call in node.calls]])
-
-    namelen = max(len(name) for name in graph if name.endswith("_cr"))
-    print(("="*namelen)+" =======")
-
-    for funcname in graph:
-        if funcname.endswith("_cr"):
-            print(f"{funcname}\t{nstatic(funcname)}")
-
-    print(("="*namelen)+" =======")
-
-    for funcname in sorted(missing):
-        print(f"{funcname}\tmissing")
-
-if __name__ == "__main__":
-    main()
diff --git a/stack.sh b/stack.sh
deleted file mode 100755
index 4a8a12e..0000000
--- a/stack.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-make >&2 && find build -name '*.ci' -exec cat -- {} + | python ./stack.py
-- 
cgit v1.2.3-2-g168b