summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1998-06-12 15:02:03 +0000
committerpeter <peter@FreeBSD.org>1998-06-12 15:02:03 +0000
commit7eb39bf3d30f7c508cfa5942b77eb7545e14d388 (patch)
tree84f4d5d3c8463472d4a4e011e39a9600b1f4cedf
parent526d5b8cd74e7840bf26f1f12498f31a742cec47 (diff)
downloadFreeBSD-src-7eb39bf3d30f7c508cfa5942b77eb7545e14d388.zip
FreeBSD-src-7eb39bf3d30f7c508cfa5942b77eb7545e14d388.tar.gz
Make nlist() understand elf unconditionally
-rw-r--r--lib/libc/gen/Makefile.inc6
-rw-r--r--lib/libc/gen/nlist.c1
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index ab7f571..47c6ca4 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $Id: Makefile.inc,v 1.45 1998/03/09 06:48:25 jb Exp $
+# $Id: Makefile.inc,v 1.46 1998/06/10 16:20:10 jdp Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen
@@ -30,10 +30,6 @@ SRCS+= _rand48.c _spinlock_stub.c alarm.c arc4random.c assert.c \
# machine-dependent gen sources
.include "${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc"
-.if defined(BINFORMAT) && ${BINFORMAT} == elf
-CFLAGS+=-D_NLIST_DO_ELF
-.endif
-
.if ${LIB} == "c"
MAN3+= alarm.3 arc4random.3 clock.3 \
confstr.3 crypt.3 ctermid.3 daemon.3 \
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 3100a12..42ff534 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -47,6 +47,7 @@ static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
#include <unistd.h>
#define _NLIST_DO_AOUT
+#define _NLIST_DO_ELF
#ifdef _NLIST_DO_ELF
#include <elf.h>
OpenPOWER on IntegriCloud