Merge remote-tracking branch 'kibi/master'
This commit is contained in:
commit
1f5587e144
|
@ -397,25 +397,6 @@ extern _X_EXPORT unsigned int inl(unsigned int port);
|
||||||
#include <machine/pio.h>
|
#include <machine/pio.h>
|
||||||
#endif /* __NetBSD__ */
|
#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__)
|
# elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
|
||||||
|
|
||||||
# include <inttypes.h>
|
# include <inttypes.h>
|
||||||
|
|
|
@ -46,7 +46,11 @@ void xorg_backtrace(void)
|
||||||
ErrorF("\nBacktrace:\n");
|
ErrorF("\nBacktrace:\n");
|
||||||
size = backtrace(array, 64);
|
size = backtrace(array, 64);
|
||||||
for (i = 0; i < size; i++) {
|
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)";
|
mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)";
|
||||||
if (info.dli_saddr)
|
if (info.dli_saddr)
|
||||||
ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod,
|
ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user