summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhe <he@NetBSD.org>2009-08-20 19:17:19 +0000
committerhe <he@NetBSD.org>2009-08-20 19:17:19 +0000
commitb233b36efac379d91c2ed37d318d7934cb54542e (patch)
treea9e89983addfdfa41096daad2559000f9b215a5d
parentd1c69ed983cf7e5faefedc58fa3a3a5fce2cc8c7 (diff)
Don't include <a.out.h> unless it's needed, and don't build
the aout subdir if on mips. Fixes build for mips ports.
-rw-r--r--usr.bin/ldd/Makefile9
-rw-r--r--usr.bin/ldd/ldd.c5
-rw-r--r--usr.bin/ldd/ldd_elfxx.c5
3 files changed, 11 insertions, 8 deletions
diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile
index 7c747c42bcb..a74c6aaca6c 100644
--- a/usr.bin/ldd/Makefile
+++ b/usr.bin/ldd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/04/14 22:15:22 lukem Exp $
+# $NetBSD: Makefile,v 1.11 2009/08/20 19:17:19 he Exp $
WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
@@ -8,9 +8,14 @@ PROG= ldd
SRCS= ldd.c
MAN= ldd.1
-SUBDIR= aout elf32 elf64
+
+.if (${MACHINE_ARCH} != "mips")
+SUBDIR= aout
LIB_AOUTDIR!= cd ${.CURDIR}/aout && ${PRINTOBJDIR}
EXTRA_LIBS+= ${LIB_AOUTDIR}/libldd_aout.a
+.endif
+
+SUBDIR+= elf32 elf64
.if (${MACHINE_ARCH} != "alpha")
LIB_ELF32DIR!= cd ${.CURDIR}/elf32 && ${PRINTOBJDIR}
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 25c3b2ab34c..15ccca327a6 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ldd.c,v 1.6 2009/05/20 16:20:01 christos Exp $ */
+/* $NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,14 +62,13 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.6 2009/05/20 16:20:01 christos Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $");
#endif /* not lint */
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/wait.h>
-#include <a.out.h>
#include <dirent.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/ldd/ldd_elfxx.c b/usr.bin/ldd/ldd_elfxx.c
index b3cf0219f35..57d83c626a4 100644
--- a/usr.bin/ldd/ldd_elfxx.c
+++ b/usr.bin/ldd/ldd_elfxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ldd_elfxx.c,v 1.2 2009/02/03 03:01:02 mrg Exp $ */
+/* $NetBSD: ldd_elfxx.c,v 1.3 2009/08/20 19:17:19 he Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,14 +62,13 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ldd_elfxx.c,v 1.2 2009/02/03 03:01:02 mrg Exp $");
+__RCSID("$NetBSD: ldd_elfxx.c,v 1.3 2009/08/20 19:17:19 he Exp $");
#endif /* not lint */
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/wait.h>
-#include <a.out.h>
#include <dirent.h>
#include <err.h>
#include <errno.h>