diff options
author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/crunch | |
parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz |
Merge head from 7/28
Diffstat (limited to 'usr.sbin/crunch')
-rw-r--r-- | usr.sbin/crunch/crunchgen/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/crunch/crunchgen/Makefile.depend | 1 | ||||
-rw-r--r-- | usr.sbin/crunch/crunchgen/crunchgen.1 | 6 | ||||
-rw-r--r-- | usr.sbin/crunch/crunchide/Makefile | 7 | ||||
-rw-r--r-- | usr.sbin/crunch/crunchide/crunchide.1 | 4 | ||||
-rw-r--r-- | usr.sbin/crunch/crunchide/exec_elf32.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/crunch/crunchgen/Makefile b/usr.sbin/crunch/crunchgen/Makefile index 8d0a78b..7b07f2b 100644 --- a/usr.sbin/crunch/crunchgen/Makefile +++ b/usr.sbin/crunch/crunchgen/Makefile @@ -4,6 +4,8 @@ PROG= crunchgen SRCS= crunchgen.c crunched_skel.c CLEANFILES+= crunched_skel.c +NO_PIE= yes + crunched_skel.c: crunched_main.c sh -e ${.CURDIR}/mkskel.sh ${.CURDIR}/crunched_main.c >crunched_skel.c diff --git a/usr.sbin/crunch/crunchgen/Makefile.depend b/usr.sbin/crunch/crunchgen/Makefile.depend index 41b04bf..d10ac0b 100644 --- a/usr.sbin/crunch/crunchgen/Makefile.depend +++ b/usr.sbin/crunch/crunchgen/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1 index 66fe8f3..b9aef31 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.1 +++ b/usr.sbin/crunch/crunchgen/crunchgen.1 @@ -444,7 +444,7 @@ would also need to be copied to the install floppy. The .Nm utility was written by -.An James da Silva Aq jds@cs.umd.edu . +.An James da Silva Aq Mt jds@cs.umd.edu . .Pp Copyright (c) 1994 University of Maryland. All Rights Reserved. @@ -452,9 +452,9 @@ All Rights Reserved. The .Ic libs_so keyword was added in 2005 by -.An Adrian Steinmann Aq ast@marabu.ch +.An Adrian Steinmann Aq Mt ast@marabu.ch and -.An Ceri Davies Aq ceri@FreeBSD.org . +.An Ceri Davies Aq Mt ceri@FreeBSD.org . .Sh CAVEATS While .Nm diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile index 2a6c500..e328aa4 100644 --- a/usr.sbin/crunch/crunchide/Makefile +++ b/usr.sbin/crunch/crunchide/Makefile @@ -3,6 +3,8 @@ PROG= crunchide SRCS= crunchide.c +NO_PIE= yes + TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == i386 && ${MACHINE_ARCH} == i386 @@ -10,9 +12,8 @@ CFLAGS+=-DNLIST_AOUT SRCS+= exec_aout.c .endif -.if ${TARGET_ARCH} == ia64 || ${TARGET_ARCH} == powerpc64 || \ - ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH} == amd64 || \ - ${TARGET_ARCH:Mmips64*} +.if ${TARGET_ARCH} == amd64 || ${TARGET_ARCH} == powerpc64 || \ + ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH:Mmips64*} CFLAGS+=-DNLIST_ELF64 SRCS+= exec_elf64.c exec_elf64.o: exec_elf32.c diff --git a/usr.sbin/crunch/crunchide/crunchide.1 b/usr.sbin/crunch/crunchide/crunchide.1 index ef9947d..4bdda5f 100644 --- a/usr.sbin/crunch/crunchide/crunchide.1 +++ b/usr.sbin/crunch/crunchide/crunchide.1 @@ -76,12 +76,12 @@ multiple component programs. The .Nm crunch utility was written by -.An James da Silva Aq jds@cs.umd.edu . +.An James da Silva Aq Mt jds@cs.umd.edu . .Pp Copyright (c) 1994 University of Maryland. All Rights Reserved. .Pp -.An Chris Demetriou Aq cgd@netbsd.org +.An Chris Demetriou Aq Mt cgd@netbsd.org reorganized .Nm so that it supported multiple object formats, and added diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c index 752007f..e9bc227 100644 --- a/usr.sbin/crunch/crunchide/exec_elf32.c +++ b/usr.sbin/crunch/crunchide/exec_elf32.c @@ -186,10 +186,6 @@ ELFNAMEEND(check)(int fd, const char *fn) #endif case EM_MIPS: break; case /* EM_MIPS_RS3_LE */ EM_MIPS_RS4_BE: break; -#ifndef EM_IA_64 -#define EM_IA_64 50 -#endif - case EM_IA_64: break; #ifndef EM_PPC #define EM_PPC 20 #endif |