Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pull across the struct netbsd32_exec definition and use that in all

Browse Source 
cases, since we never did 64 bit a.out.  now ldd on 32 bit a.out
at least tries to work, but fails (on sparc or sparc64, no idea yet
for x86) the same way that all dynamic a.out binaries fail.
This commit is contained in:
mrg 2009-01-11 00:06:55 +00:00
parent c0284edf66
commit 0d6aaaf295
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
usr.bin/ldd/ldd_aout.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ldd_aout.c,v 1.1 2009/01/06 03:59:56 mrg Exp $ */
/* $NetBSD: ldd_aout.c,v 1.2 2009/01/11 00:06:55 mrg Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ldd_aout.c,v 1.1 2009/01/06 03:59:56 mrg Exp $");
__RCSID("$NetBSD: ldd_aout.c,v 1.2 2009/01/11 00:06:55 mrg Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -46,6 +46,25 @@ __RCSID("$NetBSD: ldd_aout.c,v 1.1 2009/01/06 03:59:56 mrg Exp $");
#include <string.h>
#include <unistd.h>
/* from <compat/netbsd32/netbsd32_exec.h> */
/*
* Header prepended to each a.out file.
* only manipulate the a_midmag field via the
* N_SETMAGIC/N_GET{MAGIC,MID,FLAG} macros below.
*/
typedef unsigned int netbsd32_u_long;
struct netbsd32_exec {
netbsd32_u_long a_midmag; /* htonl(flags<<26 | mid<<16 | magic) */
netbsd32_u_long a_text; /* text segment size */
netbsd32_u_long a_data; /* initialized data size */
netbsd32_u_long a_bss; /* uninitialized data size */
netbsd32_u_long a_syms; /* symbol table size */
netbsd32_u_long a_entry; /* entry point */
netbsd32_u_long a_trsize; /* text relocation size */
netbsd32_u_long a_drsize; /* data relocation size */
};
/*
* XXX put this here, rather than a separate ldd_aout.h
#include "ldd.h"
@ -56,7 +75,7 @@ int
aout_ldd(char *file, char *fmt1, char *fmt2)
{
struct stat st;
struct exec hdr;
struct netbsd32_exec hdr;
int status, rval;
int fd;