diff options
| author | Keith Packard <keithp@keithp.com> | 2012-01-09 11:37:59 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-09 11:37:59 -0800 |
| commit | 1f5587e14406c083687203030db6a11691ac9d9f (patch) | |
| tree | 915c1a12a150595f1bd00e4822327cf743f9ec3c | |
| parent | a97252db24669a3e26a935024ea38b8a28d30586 (diff) | |
| parent | 6269977c91071e0ea16ca5b4b8e15fd6db0b6fcf (diff) | |
Merge remote-tracking branch 'kibi/master'
| -rw-r--r-- | hw/xfree86/common/compiler.h | 19 | ||||
| -rw-r--r-- | os/backtrace.c | 6 |
2 files changed, 5 insertions, 20 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 9e00d7571..34e60c52a 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -397,25 +397,6 @@ extern _X_EXPORT unsigned int inl(unsigned int port); #include <machine/pio.h> #endif /* __NetBSD__ */ -# elif defined(linux) && defined(__ia64__) - -# include <inttypes.h> - -# include <sys/io.h> - -# undef outb -# undef outw -# undef outl -# undef inb -# undef inw -# undef inl -extern _X_EXPORT void outb(unsigned long port, unsigned char val); -extern _X_EXPORT void outw(unsigned long port, unsigned short val); -extern _X_EXPORT void outl(unsigned long port, unsigned int val); -extern _X_EXPORT unsigned int inb(unsigned long port); -extern _X_EXPORT unsigned int inw(unsigned long port); -extern _X_EXPORT unsigned int inl(unsigned long port); - # elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__) # include <inttypes.h> diff --git a/os/backtrace.c b/os/backtrace.c index 58b4b1f34..298bf1898 100644 --- a/os/backtrace.c +++ b/os/backtrace.c @@ -46,7 +46,11 @@ void xorg_backtrace(void) ErrorF("\nBacktrace:\n"); size = backtrace(array, 64); for (i = 0; i < size; i++) { - dladdr(array[i], &info); + int rc = dladdr(array[i], &info); + if (rc == 0) { + ErrorF("%d: ?? [%p]\n", i, array[i]); + continue; + } mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)"; if (info.dli_saddr) ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod, |