svn commit: r356273 - head/sys/arm/arm
Ian Lepore
ian at FreeBSD.org
Thu Jan 2 15:38:18 UTC 2020
Author: ian
Date: Thu Jan 2 15:38:17 2020
New Revision: 356273
URL: https://svnweb.freebsd.org/changeset/base/356273
Log:
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.
Modified:
head/sys/arm/arm/elf_machdep.c
Modified: head/sys/arm/arm/elf_machdep.c
==============================================================================
--- head/sys/arm/arm/elf_machdep.c Thu Jan 2 14:39:37 2020 (r356272)
+++ head/sys/arm/arm/elf_machdep.c Thu Jan 2 15:38:17 2020 (r356273)
@@ -52,6 +52,10 @@ __FBSDID("$FreeBSD$");
#include <machine/vfp.h>
#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);
}
More information about the svn-src-all
mailing list