d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC of 180646, 180877:

Browse Source 
After the commit of SVN rev 180236, wilko@ noticed that the approach
doesn't work on the Alpha platform: machine/elf.h doesn't include
sys/elf32.h there.

PR:		related to bin/124906
Approved by:	bde@
This commit is contained in:
edwin 2008-07-30 03:32:32 +00:00
parent c4fec63c91
commit 0f415d6c46
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.bin/ldd/ldd.c
View File

@ -48,6 +48,15 @@ __FBSDID("$FreeBSD$");
#include "extern.h" #include "extern.h"
/*
* 32-bit ELF data structures can only be used if the system header[s] declare
* them. There is no official macro for determining whether they are declared,
* so check for the existence of one of the 32-macros defined in elf(5).
*/
#ifdef ELF32_R_TYPE
#define ELF32_SUPPORTED
#endif
static int is_executable(const char *fname, int fd, int *is_shlib, static int is_executable(const char *fname, int fd, int *is_shlib,
int *type); int *type);
static void usage(void); static void usage(void);
@ -55,7 +64,7 @@ static void usage(void);
#define TYPE_UNKNOWN 0 #define TYPE_UNKNOWN 0
#define TYPE_AOUT 1 #define TYPE_AOUT 1
#define TYPE_ELF 2 /* Architecture default */ #define TYPE_ELF 2 /* Architecture default */
#if __ELF_WORD_SIZE > 32 #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED)
#define TYPE_ELF32 3 /* Explicit 32 bits on architectures >32 bits */ #define TYPE_ELF32 3 /* Explicit 32 bits on architectures >32 bits */
#endif #endif
@ -73,7 +82,7 @@ const char *envdef[ENV_LAST] = {
"LD_TRACE_LOADED_OBJECTS_PROGNAME", "LD_TRACE_LOADED_OBJECTS_PROGNAME",
"LD_TRACE_LOADED_OBJECTS_ALL", "LD_TRACE_LOADED_OBJECTS_ALL",
}; };
#if __ELF_WORD_SIZE > 32 #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED)
const char *env32[ENV_LAST] = { const char *env32[ENV_LAST] = {
"LD_32_TRACE_LOADED_OBJECTS", "LD_32_TRACE_LOADED_OBJECTS",
"LD_32_TRACE_LOADED_OBJECTS_FMT1", "LD_32_TRACE_LOADED_OBJECTS_FMT1",
@ -154,7 +163,7 @@ main(int argc, char *argv[])
case TYPE_AOUT: case TYPE_AOUT:
env = envdef; env = envdef;
break; break;
#if __ELF_WORD_SIZE > 32 #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED)
case TYPE_ELF32: case TYPE_ELF32:
env = env32; env = env32;
break; break;
@ -229,7 +238,9 @@ is_executable(const char *fname, int fd, int *is_shlib, int *type)
{ {
union { union {
struct exec aout; struct exec aout;
#if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED)
Elf32_Ehdr elf32; Elf32_Ehdr elf32;
#endif
Elf_Ehdr elf; Elf_Ehdr elf;
} hdr; } hdr;
int n; int n;
@ -256,7 +267,7 @@ is_executable(const char *fname, int fd, int *is_shlib, int *type)
return (1); return (1);
} }
#if __ELF_WORD_SIZE > 32 #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED)
if ((size_t)n >= sizeof(hdr.elf32) && IS_ELF(hdr.elf32) && if ((size_t)n >= sizeof(hdr.elf32) && IS_ELF(hdr.elf32) &&
hdr.elf32.e_ident[EI_CLASS] == ELFCLASS32) { hdr.elf32.e_ident[EI_CLASS] == ELFCLASS32) {
/* Handle 32 bit ELF objects */ /* Handle 32 bit ELF objects */