From 042ea0aa161fe2a696f2e873905e9f7e556abfc5 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 12 Oct 2017 15:16:27 +0000 Subject: [PATCH] Move panic back into libsa. It's documented in libstand(3) to belong there. Sponsored by: Netflix --- sys/boot/common/Makefile.inc | 2 +- sys/boot/libsa/Makefile | 4 ++-- sys/boot/{common => libsa}/panic.c | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename sys/boot/{common => libsa}/panic.c (100%) diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc index 3f9d925d0ef..59bd6497e0a 100644 --- a/sys/boot/common/Makefile.inc +++ b/sys/boot/common/Makefile.inc @@ -4,7 +4,7 @@ SRCS+= boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c -SRCS+= module.c panic.c +SRCS+= module.c .if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64" SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c diff --git a/sys/boot/libsa/Makefile b/sys/boot/libsa/Makefile index 2e9c304ac23..cdd4a86a5ad 100644 --- a/sys/boot/libsa/Makefile +++ b/sys/boot/libsa/Makefile @@ -25,8 +25,8 @@ CFLAGS+= -I${SASRC} # standalone components and stuff we have modified locally SRCS+= gzguts.h zutil.h __main.c assert.c bcd.c environment.c getopt.c gets.c \ - globals.c pager.c printf.c strdup.c strerror.c strtol.c strtoul.c random.c \ - sbrk.c twiddle.c zalloc.c zalloc_malloc.c + globals.c pager.c panic.c printf.c strdup.c strerror.c strtol.c strtoul.c \ + random.c sbrk.c twiddle.c zalloc.c zalloc_malloc.c # private (pruned) versions of libc string functions SRCS+= strcasecmp.c diff --git a/sys/boot/common/panic.c b/sys/boot/libsa/panic.c similarity index 100% rename from sys/boot/common/panic.c rename to sys/boot/libsa/panic.c