Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/ldd Don't try to call the (no longer defined) aout_l...



details:   https://anonhg.NetBSD.org/src/rev/e582955ecf9d
branches:  trunk
changeset: 746824:e582955ecf9d
user:      he <he%NetBSD.org@localhost>
date:      Thu Aug 20 21:06:17 2009 +0000

description:
Don't try to call the (no longer defined) aout_ldd() function
if we're building for mips.

diffstat:

 usr.bin/ldd/ldd.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r bc7039902572 -r e582955ecf9d usr.bin/ldd/ldd.c
--- a/usr.bin/ldd/ldd.c Thu Aug 20 19:44:53 2009 +0000
+++ b/usr.bin/ldd/ldd.c Thu Aug 20 21:06:17 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $       */
+/*     $NetBSD: ldd.c,v 1.8 2009/08/20 21:06:17 he Exp $       */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.8 2009/08/20 21:06:17 he Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -151,12 +151,15 @@
                        warn("%s", *argv);
                        continue;
                }
-               if (elf_ldd(fd, *argv, fmt1, fmt2) == -1 &&
+               if (elf_ldd(fd, *argv, fmt1, fmt2) == -1
                    /* Alpha never had 32 bit support. */
 #if defined(_LP64) && !defined(__alpha__)
-                   elf32_ldd(fd, *argv, fmt1, fmt2) == -1 &&
+                   && elf32_ldd(fd, *argv, fmt1, fmt2) == -1
 #endif
-                   aout_ldd(fd, *argv, fmt1, fmt2) == -1)
+#if !defined(__mips__)
+                   && aout_ldd(fd, *argv, fmt1, fmt2) == -1
+#endif
+                   )
                        warnx("%s", error_message);
                close(fd);
        }



Home | Main Index | Thread Index | Old Index