svn commit: r281655 - head/usr.sbin/crunch/crunchide

[Ed Maste]

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 *);