From fd77f9cbbade5e2e4516c2d755425d07a90d1923 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 21 Dec 2006 09:16:19 -0800 Subject: [PATCH] Try dlsym(RTLD_DEFAULT) first when finding symbols. The previous mechanism failed when finding drm symbols now that libdrm has moved to being linked by libdri instead of being linked into the server. (cherry picked from aab2ca204279b638c7e5bb6b8427c58be9704c57 commit) --- hw/xfree86/loader/dlloader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c index a0e867056..2afdef789 100644 --- a/hw/xfree86/loader/dlloader.c +++ b/hw/xfree86/loader/dlloader.c @@ -113,6 +113,10 @@ DLFindSymbol(const char *name) DLModuleList *l; void *p; + p = dlsym(RTLD_DEFAULT, name); + if (p != NULL) + return p; + for (l = dlModuleList; l != NULL; l = l->next) { p = DLFindSymbolLocal(l->module, name); if (p)