Re: [PATCH v2 3/8] tools build: Deduplicate test-libunwind for different architectures

Arnaldo Carvalho de Melo
2026-03-30T21:08:58Z

On Thu, Mar 05, 2026 at 02:19:22PM -0800, Ian Rogers wrote:
> The separate test files only exist to pass a different #include,
> instead have a single source file and pass -include to $(CC) to
> include the relevant header file for the architecture being
> tested. Generate the rules using a foreach loop. Include tests for all
> current libunwind architectures.

Clever :-)

- Arnaldo

> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/build/feature/Makefile | 38 +++++++++----------
> tools/build/feature/test-libunwind-aarch64.c | 27 -------------
> tools/build/feature/test-libunwind-arm.c | 28 --------------
> .../test-libunwind-debug-frame-aarch64.c | 17 ---------
> .../feature/test-libunwind-debug-frame-arm.c | 17 ---------
> .../feature/test-libunwind-debug-frame.c | 1 -
> tools/build/feature/test-libunwind-x86.c | 28 --------------
> tools/build/feature/test-libunwind-x86_64.c | 28 --------------
> tools/build/feature/test-libunwind.c | 1 -
> 9 files changed, 19 insertions(+), 166 deletions(-)
> delete mode 100644 tools/build/feature/test-libunwind-aarch64.c
> delete mode 100644 tools/build/feature/test-libunwind-arm.c
> delete mode 100644 tools/build/feature/test-libunwind-debug-frame-aarch64.c
> delete mode 100644 tools/build/feature/test-libunwind-debug-frame-arm.c
> delete mode 100644 tools/build/feature/test-libunwind-x86.c
> delete mode 100644 tools/build/feature/test-libunwind-x86_64.c
>
> diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
> index 1fbcb3ce74d2..a0b40e826688 100644
> --- a/tools/build/feature/Makefile
> +++ b/tools/build/feature/Makefile
> @@ -204,27 +204,27 @@ $(OUTPUT)test-numa_num_possible_cpus.bin:
> $(BUILD) -lnuma
>
> $(OUTPUT)test-libunwind.bin:
> - $(BUILD) -lelf -llzma
> + $(BUILD) -include libunwind.h -lelf -llzma -lunwind
>
> $(OUTPUT)test-libunwind-debug-frame.bin:
> - $(BUILD) -lelf -llzma
> -$(OUTPUT)test-libunwind-x86.bin:
> - $(BUILD) -lelf -llzma -lunwind-x86
> -
> -$(OUTPUT)test-libunwind-x86_64.bin:
> - $(BUILD) -lelf -llzma -lunwind-x86_64
> -
> -$(OUTPUT)test-libunwind-arm.bin:
> - $(BUILD) -lelf -llzma -lunwind-arm
> -
> -$(OUTPUT)test-libunwind-aarch64.bin:
> - $(BUILD) -lelf -llzma -lunwind-aarch64
> -
> -$(OUTPUT)test-libunwind-debug-frame-arm.bin:
> - $(BUILD) -lelf -llzma -lunwind-arm
> -
> -$(OUTPUT)test-libunwind-debug-frame-aarch64.bin:
> - $(BUILD) -lelf -llzma -lunwind-aarch64
> + $(BUILD) -include libunwind.h -lelf -llzma -lunwind
> +
> +LIBUNWIND_ARCHS:=aarch64 arm loongarch64 mips ppc32 ppc64 riscv s390x x86 x86_64
> +define LIBUNWIND_RULE
> +$$(OUTPUT)test-libunwind-$(1).bin:
> + $$(CC) $$(CFLAGS) -MD -Wall -Werror -include libunwind-$(1).h -o $$@ \
> + test-libunwind.c $$(LDFLAGS) -lelf -llzma -lunwind-$(1) \
> + > $$(@:.bin=.make.output) 2>&1
> +
> +$$(OUTPUT)test-libunwind-debug-frame-$(1).bin:
> + $$(CC) $$(CFLAGS) -MD -Wall -Werror -include libunwind-$(1).h -o $$@ \
> + test-libunwind-debug-frame.c $$(LDFLAGS) -lelf -llzma -lunwind-$(1) \
> + > $$(@:.bin=.make.output) 2>&1
> +
> +endef
> +$(foreach arch,$(LIBUNWIND_ARCHS), \
> + $(eval $(call LIBUNWIND_RULE,$(arch))) \
> +)
>
> $(OUTPUT)test-libslang.bin:
> $(BUILD) -lslang
> diff --git a/tools/build/feature/test-libunwind-aarch64.c b/tools/build/feature/test-libunwind-aarch64.c
> deleted file mode 100644
> index 323803f49212..000000000000
> --- a/tools/build/feature/test-libunwind-aarch64.c
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -#include <libunwind-aarch64.h>
> -#include <stdlib.h>
> -
> -extern int UNW_OBJ(dwarf_search_unwind_table) (unw_addr_space_t as,
> - unw_word_t ip,
> - unw_dyn_info_t *di,
> - unw_proc_info_t *pi,
> - int need_unwind_info, void *arg);
> -
> -#define dwarf_search_unwind_table UNW_OBJ(dwarf_search_unwind_table)
> -
> -static unw_accessors_t accessors;
> -
> -int main(void)
> -{
> - unw_addr_space_t addr_space;
> -
> - addr_space = unw_create_addr_space(&accessors, 0);
> - if (addr_space)
> - return 0;
> -
> - unw_init_remote(NULL, addr_space, NULL);
> - dwarf_search_unwind_table(addr_space, 0, NULL, NULL, 0, NULL);
> -
> - return 0;
> -}
> diff --git a/tools/build/feature/test-libunwind-arm.c b/tools/build/feature/test-libunwind-arm.c
> deleted file mode 100644
> index cb378b7d6866..000000000000
> --- a/tools/build/feature/test-libunwind-arm.c
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -#include <libunwind-arm.h>
> -#include <stdlib.h>
> -
> -extern int UNW_OBJ(dwarf_search_unwind_table) (unw_addr_space_t as,
> - unw_word_t ip,
> - unw_dyn_info_t *di,
> - unw_proc_info_t *pi,
> - int need_unwind_info, void *arg);
> -
> -
> -#define dwarf_search_unwind_table UNW_OBJ(dwarf_search_unwind_table)
> -
> -static unw_accessors_t accessors;
> -
> -int main(void)
> -{
> - unw_addr_space_t addr_space;
> -
> - addr_space = unw_create_addr_space(&accessors, 0);
> - if (addr_space)
> - return 0;
> -
> - unw_init_remote(NULL, addr_space, NULL);
> - dwarf_search_unwind_table(addr_space, 0, NULL, NULL, 0, NULL);
> -
> - return 0;
> -}
> diff --git a/tools/build/feature/test-libunwind-debug-frame-aarch64.c b/tools/build/feature/test-libunwind-debug-frame-aarch64.c
> deleted file mode 100644
> index 36d6646c185e..000000000000
> --- a/tools/build/feature/test-libunwind-debug-frame-aarch64.c
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -#include <libunwind-aarch64.h>
> -#include <stdlib.h>
> -
> -extern int
> -UNW_OBJ(dwarf_find_debug_frame) (int found, unw_dyn_info_t *di_debug,
> - unw_word_t ip, unw_word_t segbase,
> - const char *obj_name, unw_word_t start,
> - unw_word_t end);
> -
> -#define dwarf_find_debug_frame UNW_OBJ(dwarf_find_debug_frame)
> -
> -int main(void)
> -{
> - dwarf_find_debug_frame(0, NULL, 0, 0, NULL, 0, 0);
> - return 0;
> -}
> diff --git a/tools/build/feature/test-libunwind-debug-frame-arm.c b/tools/build/feature/test-libunwind-debug-frame-arm.c
> deleted file mode 100644
> index 8696e48e1268..000000000000
> --- a/tools/build/feature/test-libunwind-debug-frame-arm.c
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -#include <libunwind-arm.h>
> -#include <stdlib.h>
> -
> -extern int
> -UNW_OBJ(dwarf_find_debug_frame) (int found, unw_dyn_info_t *di_debug,
> - unw_word_t ip, unw_word_t segbase,
> - const char *obj_name, unw_word_t start,
> - unw_word_t end);
> -
> -#define dwarf_find_debug_frame UNW_OBJ(dwarf_find_debug_frame)
> -
> -int main(void)
> -{
> - dwarf_find_debug_frame(0, NULL, 0, 0, NULL, 0, 0);
> - return 0;
> -}
> diff --git a/tools/build/feature/test-libunwind-debug-frame.c b/tools/build/feature/test-libunwind-debug-frame.c
> index efb55cdd8d01..4c57e37004b3 100644
> --- a/tools/build/feature/test-libunwind-debug-frame.c
> +++ b/tools/build/feature/test-libunwind-debug-frame.c
> @@ -1,5 +1,4 @@
> // SPDX-License-Identifier: GPL-2.0
> -#include <libunwind.h>
> #include <stdlib.h>
>
> extern int
> diff --git a/tools/build/feature/test-libunwind-x86.c b/tools/build/feature/test-libunwind-x86.c
> deleted file mode 100644
> index e5e0f6c89637..000000000000
> --- a/tools/build/feature/test-libunwind-x86.c
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -#include <libunwind-x86.h>
> -#include <stdlib.h>
> -
> -extern int UNW_OBJ(dwarf_search_unwind_table) (unw_addr_space_t as,
> - unw_word_t ip,
> - unw_dyn_info_t *di,
> - unw_proc_info_t *pi,
> - int need_unwind_info, void *arg);
> -
> -
> -#define dwarf_search_unwind_table UNW_OBJ(dwarf_search_unwind_table)
> -
> -static unw_accessors_t accessors;
> -
> -int main(void)
> -{
> - unw_addr_space_t addr_space;
> -
> - addr_space = unw_create_addr_space(&accessors, 0);
> - if (addr_space)
> - return 0;
> -
> - unw_init_remote(NULL, addr_space, NULL);
> - dwarf_search_unwind_table(addr_space, 0, NULL, NULL, 0, NULL);
> -
> - return 0;
> -}
> diff --git a/tools/build/feature/test-libunwind-x86_64.c b/tools/build/feature/test-libunwind-x86_64.c
> deleted file mode 100644
> index 62ae4db597dc..000000000000
> --- a/tools/build/feature/test-libunwind-x86_64.c
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -#include <libunwind-x86_64.h>
> -#include <stdlib.h>
> -
> -extern int UNW_OBJ(dwarf_search_unwind_table) (unw_addr_space_t as,
> - unw_word_t ip,
> - unw_dyn_info_t *di,
> - unw_proc_info_t *pi,
> - int need_unwind_info, void *arg);
> -
> -
> -#define dwarf_search_unwind_table UNW_OBJ(dwarf_search_unwind_table)
> -
> -static unw_accessors_t accessors;
> -
> -int main(void)
> -{
> - unw_addr_space_t addr_space;
> -
> - addr_space = unw_create_addr_space(&accessors, 0);
> - if (addr_space)
> - return 0;
> -
> - unw_init_remote(NULL, addr_space, NULL);
> - dwarf_search_unwind_table(addr_space, 0, NULL, NULL, 0, NULL);
> -
> - return 0;
> -}
> diff --git a/tools/build/feature/test-libunwind.c b/tools/build/feature/test-libunwind.c
> index 53fd26614ff0..5af5dc3a73d4 100644
> --- a/tools/build/feature/test-libunwind.c
> +++ b/tools/build/feature/test-libunwind.c
> @@ -1,5 +1,4 @@
> // SPDX-License-Identifier: GPL-2.0
> -#include <libunwind.h>
> #include <stdlib.h>
>
> extern int UNW_OBJ(dwarf_search_unwind_table) (unw_addr_space_t as,
> --
> 2.53.0.473.g4a7958ca14-goog
>