From owner-svn-src-head@FreeBSD.ORG Fri Apr 17 15:18:56 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D3C7901; Fri, 17 Apr 2015 15:18:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 31C5FFD7; Fri, 17 Apr 2015 15:18:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HFIuPf022575; Fri, 17 Apr 2015 15:18:56 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HFIt8F022568; Fri, 17 Apr 2015 15:18:55 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201504171518.t3HFIt8F022568@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 17 Apr 2015 15:18:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281655 - head/usr.sbin/crunch/crunchide X-SVN-Group: head 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.20 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: Fri, 17 Apr 2015 15:18:56 -0000 Author: emaste Date: Fri Apr 17 15:18:54 2015 New Revision: 281655 URL: https://svnweb.freebsd.org/changeset/base/281655 Log: crunchide: remove unused a.out and non-functional ECOFF support Differential Revision: https://reviews.freebsd.org/D2311 Reviewed by: imp Sponsored by: The FreeBSD Foundation Deleted: head/usr.sbin/crunch/crunchide/exec_aout.c Modified: head/usr.sbin/crunch/crunchide/Makefile head/usr.sbin/crunch/crunchide/crunchide.c head/usr.sbin/crunch/crunchide/extern.h Modified: head/usr.sbin/crunch/crunchide/Makefile ============================================================================== --- head/usr.sbin/crunch/crunchide/Makefile Fri Apr 17 12:58:09 2015 (r281654) +++ head/usr.sbin/crunch/crunchide/Makefile Fri Apr 17 15:18:54 2015 (r281655) @@ -5,11 +5,6 @@ SRCS= crunchide.c TARGET_ARCH?= ${MACHINE_ARCH} -.if ${TARGET_ARCH} == i386 && ${MACHINE_ARCH} == i386 -CFLAGS+=-DNLIST_AOUT -SRCS+= exec_aout.c -.endif - .if ${TARGET_ARCH} == aarch64 || ${TARGET_ARCH} == amd64 || \ ${TARGET_ARCH} == powerpc64 || \ ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH:Mmips64*} Modified: head/usr.sbin/crunch/crunchide/crunchide.c ============================================================================== --- head/usr.sbin/crunch/crunchide/crunchide.c Fri Apr 17 12:58:09 2015 (r281654) +++ head/usr.sbin/crunch/crunchide/crunchide.c Fri Apr 17 15:18:54 2015 (r281655) @@ -212,12 +212,6 @@ struct { int (*check)(int, const char *); /* 1 if match, zero if not */ int (*hide)(int, const char *); /* non-zero if error */ } exec_formats[] = { -#ifdef NLIST_AOUT - { "a.out", check_aout, hide_aout, }, -#endif -#ifdef NLIST_ECOFF - { "ECOFF", check_elf64, hide_elf64, }, -#endif #ifdef NLIST_ELF32 { "ELF32", check_elf32, hide_elf32, }, #endif Modified: head/usr.sbin/crunch/crunchide/extern.h ============================================================================== --- head/usr.sbin/crunch/crunchide/extern.h Fri Apr 17 12:58:09 2015 (r281654) +++ head/usr.sbin/crunch/crunchide/extern.h Fri Apr 17 15:18:54 2015 (r281655) @@ -31,14 +31,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef NLIST_AOUT -int check_aout(int, const char *); -int hide_aout(int, const char *); -#endif -#ifdef NLIST_ECOFF -int check_ecoff(int, const char *); -int hide_ecoff(int, const char *); -#endif #ifdef NLIST_ELF32 int check_elf32(int, const char *); int hide_elf32(int, const char *);