Mesa (mesa_7_7_branch): mesa: no dlopen on BlueGene

Ian Romanick idr at kemper.freedesktop.org
Wed Dec 16 10:17:44 PST 2009


Module: Mesa
Branch: mesa_7_7_branch
Commit: a43fc39585c0d712244bbac5461e62f3a261d930
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a43fc39585c0d712244bbac5461e62f3a261d930

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Dec 16 08:02:52 2009 -0700

mesa: no dlopen on BlueGene

See bug 25663.

---

 src/mesa/main/dlopen.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/dlopen.c b/src/mesa/main/dlopen.c
index 414cfad..325de4b 100644
--- a/src/mesa/main/dlopen.c
+++ b/src/mesa/main/dlopen.c
@@ -31,7 +31,7 @@
 #include "compiler.h"
 #include "dlopen.h"
 
-#if defined(_GNU_SOURCE) && !defined(__MINGW32__)
+#if defined(_GNU_SOURCE) && !defined(__MINGW32__) && !defined(__blrts)
 #include <dlfcn.h>
 #endif
 #if defined(_WIN32)
@@ -46,7 +46,9 @@
 void *
 _mesa_dlopen(const char *libname, int flags)
 {
-#if defined(_GNU_SOURCE)
+#if defined(__blrts)
+   return NULL;
+#elif defined(_GNU_SOURCE)
    flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
    return dlopen(libname, flags);
 #elif defined(__MINGW32__)
@@ -65,7 +67,9 @@ _mesa_dlopen(const char *libname, int flags)
 GenericFunc
 _mesa_dlsym(void *handle, const char *fname)
 {
-#if defined(__DJGPP__)
+#if defined(__blrts)
+   return (GenericFunc) NULL
+#elif defined(__DJGPP__)
    /* need '_' prefix on symbol names */
    char fname2[1000];
    fname2[0] = '_';
@@ -88,7 +92,9 @@ _mesa_dlsym(void *handle, const char *fname)
 void
 _mesa_dlclose(void *handle)
 {
-#if defined(_GNU_SOURCE)
+#if defined(__blrts)
+   (void) handle;
+#elif defined(_GNU_SOURCE)
    dlclose(handle);
 #elif defined(__MINGW32__)
    FreeLibrary(handle);



More information about the mesa-commit mailing list