diff options
| author | Bryan Cantrill <bryan@joyent.com> | 2015-06-05 18:51:46 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2015-09-03 15:14:18 -0700 |
| commit | 2ed96329a073f74bd33f766ab982be14f3205bc9 (patch) | |
| tree | ded5bbe92f8d2ba531a5436d1f624edf4a1829fa /usr/src | |
| parent | 22146ea93e24c7deb02c49c33b2ab98605ce78b4 (diff) | |
| download | illumos-joyent-2ed96329a073f74bd33f766ab982be14f3205bc9.tar.gz | |
6178 fix for 5234 reintroduced 3921
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libproc/common/Pcore.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr/src/lib/libproc/common/Pcore.c b/usr/src/lib/libproc/common/Pcore.c index c899ee1b20..4ebca85e1f 100644 --- a/usr/src/lib/libproc/common/Pcore.c +++ b/usr/src/lib/libproc/common/Pcore.c @@ -2664,11 +2664,15 @@ Pfgrab_core(int core_fd, const char *aout_path, int *perr) P->map_exec = core_name_mapping(P, addr, "a.out"); /* - * If we're a statically linked executable, then just locate the - * executable's text and data and name them after the executable. + * If we're a statically linked executable (or we're on x86 and looking + * at a Linux core dump), then just locate the executable's text and + * data and name them after the executable. */ - if (base_addr == (uintptr_t)-1L || - core_info->core_osabi == ELFOSABI_NONE) { +#ifndef __x86 + if (base_addr == (uintptr_t)-1L) { +#else + if (base_addr == (uintptr_t)-1L || from_linux) { +#endif dprintf("looking for text and data: %s\n", execname); map_info_t *tmp, *dmp; file_info_t *fp; |