From owner-svn-src-head@freebsd.org Thu Oct 12 15:16:29 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A2D7E2C6B8; Thu, 12 Oct 2017 15:16:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 15F43800AE; Thu, 12 Oct 2017 15:16:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9CFGSmi046046; Thu, 12 Oct 2017 15:16:28 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9CFGROI046043; Thu, 12 Oct 2017 15:16:27 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710121516.v9CFGROI046043@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 12 Oct 2017 15:16:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324559 - in head/sys/boot: common libsa X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: common libsa X-SVN-Commit-Revision: 324559 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Oct 2017 15:16:29 -0000 Author: imp Date: Thu Oct 12 15:16:27 2017 New Revision: 324559 URL: https://svnweb.freebsd.org/changeset/base/324559 Log: Move panic back into libsa. It's documented in libstand(3) to belong there. Sponsored by: Netflix Added: head/sys/boot/libsa/panic.c (contents, props changed) - copied, changed from r324558, head/sys/boot/common/panic.c Deleted: head/sys/boot/common/panic.c Modified: head/sys/boot/common/Makefile.inc head/sys/boot/libsa/Makefile Modified: head/sys/boot/common/Makefile.inc ============================================================================== --- head/sys/boot/common/Makefile.inc Thu Oct 12 15:16:22 2017 (r324558) +++ head/sys/boot/common/Makefile.inc Thu Oct 12 15:16:27 2017 (r324559) @@ -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 Modified: head/sys/boot/libsa/Makefile ============================================================================== --- head/sys/boot/libsa/Makefile Thu Oct 12 15:16:22 2017 (r324558) +++ head/sys/boot/libsa/Makefile Thu Oct 12 15:16:27 2017 (r324559) @@ -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 Copied and modified: head/sys/boot/libsa/panic.c (from r324558, head/sys/boot/common/panic.c) ==============================================================================