Author: emaste
Date: Fri Dec 18 02:34:01 2015
New Revision: 292422
URL: https://svnweb.freebsd.org/changeset/base/292422
Log:
MFC r281655: crunchide: remove unused a.out and non-functional ECOFF support
Sponsored by: The FreeBSD Foundation
Deleted:
stable/10/usr.sbin/crunch/crunchide/exec_aout.c
Modified:
stable/10/usr.sbin/crunch/crunchide/Makefile
stable/10/usr.sbin/crunch/crunchide/crunchide.c
stable/10/usr.sbin/crunch/crunchide/extern.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/crunch/crunchide/Makefile
==============================================================================
--- stable/10/usr.sbin/crunch/crunchide/Makefile Fri Dec 18 01:44:03
2015 (r292421)
+++ stable/10/usr.sbin/crunch/crunchide/Makefile Fri Dec 18 02:34:01
2015 (r292422)
@@ -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} == ia64 || ${TARGET_ARCH} == powerpc64 || \
${TARGET_ARCH} == sparc64 || ${TARGET_ARCH} == amd64 || \
${TARGET_ARCH:Mmips64*}
Modified: stable/10/usr.sbin/crunch/crunchide/crunchide.c
==============================================================================
--- stable/10/usr.sbin/crunch/crunchide/crunchide.c Fri Dec 18 01:44:03
2015 (r292421)
+++ stable/10/usr.sbin/crunch/crunchide/crunchide.c Fri Dec 18 02:34:01
2015 (r292422)
@@ -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: stable/10/usr.sbin/crunch/crunchide/extern.h
==============================================================================
--- stable/10/usr.sbin/crunch/crunchide/extern.h Fri Dec 18 01:44:03
2015 (r292421)
+++ stable/10/usr.sbin/crunch/crunchide/extern.h Fri Dec 18 02:34:01
2015 (r292422)
@@ -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 *);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
