diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-10-10 16:45:01 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-10-10 16:45:01 +0000 |
| commit | 0807b58aa571bc423da021673f9c6c3eaa0c292b (patch) | |
| tree | 670a6a358787ce175a6595afa80d02b7cb14e969 | |
| parent | 1e124b29f34ad02b5429cebc1924245c182fcc24 (diff) | |
now that no cpu assumptions are left in -- remove the cross-glue
| -rw-r--r-- | usr.bin/nm/Makefile | 19 | ||||
| -rw-r--r-- | usr.bin/nm/nm.c | 9 |
2 files changed, 3 insertions, 25 deletions
diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile index ac566c9c0ef..255870c67f0 100644 --- a/usr.bin/nm/Makefile +++ b/usr.bin/nm/Makefile @@ -1,21 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2004/10/09 20:26:57 mickey Exp $ - -TARGET_MACHINE_ARCH?= ${MACHINE_ARCH} - -.if ${TARGET_MACHINE_ARCH} != ${MACHINE_ARCH} -# XXX should make this automatic -.if ${TARGET_MACHINE_ARCH} == "i386" -CFLAGS+= -DMID_MACHINE_OVERRIDE=MID_I386 -.elif ${TARGET_MACHINE_ARCH} == "m68k" -CFLAGS+= -DMID_MACHINE_OVERRIDE=MID_M68K -.elif ${TARGET_MACHINE_ARCH} == "ns32k" -CFLAGS+= -DMID_MACHINE_OVERRIDE=MID_NS32K -.elif ${TARGET_MACHINE_ARCH} == "sparc" -CFLAGS+= -DMID_MACHINE_OVERRIDE=MID_SPARC -.elif ${TARGET_MACHINE_ARCH} == "vax" -CFLAGS+= -DMID_MACHINE_OVERRIDE=MID_VAX -.endif -.endif +# $OpenBSD: Makefile,v 1.7 2004/10/10 16:45:00 mickey Exp $ PROG= nm SRCS= nm.c elf32.c elf64.c diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c index 3837f241681..126ac52adc5 100644 --- a/usr.bin/nm/nm.c +++ b/usr.bin/nm/nm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nm.c,v 1.27 2004/10/09 20:26:57 mickey Exp $ */ +/* $OpenBSD: nm.c,v 1.28 2004/10/10 16:45:00 mickey Exp $ */ /* $NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $ */ /* @@ -42,7 +42,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)nm.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = "$OpenBSD: nm.c,v 1.27 2004/10/09 20:26:57 mickey Exp $"; +static const char rcsid[] = "$OpenBSD: nm.c,v 1.28 2004/10/10 16:45:00 mickey Exp $"; #include <sys/param.h> #include <sys/mman.h> @@ -69,11 +69,6 @@ static const char rcsid[] = "$OpenBSD: nm.c,v 1.27 2004/10/09 20:26:57 mickey Ex /* XXX get shared code to handle a.out byte-order swaps */ #include "byte.c" -#ifdef MID_MACHINE_OVERRIDE -#undef MID_MACHINE -#define MID_MACHINE MID_MACHINE_OVERRIDE -#endif - #define SYMTABMAG "/ " #define STRTABMAG "//" |