From e0f07fadf643faa4751ba92b2160e532bcda92fa Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Thu, 2 Jan 2020 15:38:17 +0000 Subject: [PATCH] Since arm/unwind.c s conditionally compiled, only call functions in it when one of those conditions is true. Fixes build failure on kernel configs with no debugging options active. --- sys/arm/arm/elf_machdep.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c index bc79724c422..e7c1f3f5641 100644 --- a/sys/arm/arm/elf_machdep.c +++ b/sys/arm/arm/elf_machdep.c @@ -52,6 +52,10 @@ __FBSDID("$FreeBSD$"); #include #endif +#include "opt_ddb.h" /* for OPT_DDB */ +#include "opt_global.h" /* for OPT_KDTRACE_HOOKS */ +#include "opt_stack.h" /* for OPT_STACK */ + static boolean_t elf32_arm_abi_supported(struct image_params *); u_long elf_hwcap; @@ -311,11 +315,13 @@ elf_cpu_load_file(linker_file_t lf) cpu_icache_sync_range((vm_offset_t)lf->address, (vm_size_t)lf->size); #endif +#if defined(DDB) || defined(KDTRACE_HOOKS) || defined(STACK) /* * Inform the stack(9) code of the new module, so it can acquire its * per-module unwind data. */ unwind_module_loaded(lf); +#endif return (0); }