Ditch more alternate-loader braindamage.

3 files changed, 0 insertions, 17 deletions

diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 49321b1b6..b3b5c1b29 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -247,10 +247,3 @@ RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
 _X_EXPORT Bool xf86inSuspend = FALSE;
 Bool xorgHWAccess = FALSE;
 PciBusId xf86IsolateDevice;
-
-#ifdef DLOPEN_HACK
-/*
- * This stuff is a hack to allow dlopen() modules to work.  It is intended
- * only to be used when using dlopen() modules for debugging purposes.
- */
-#endif
diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index f59e1ec4b..006581235 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -282,12 +282,10 @@ LoaderInit(void)
 {
     const char *osname = NULL;
 
-#ifdef DLOPEN_SUPPORT
     char *ld_bind_now = getenv("LD_BIND_NOW");
     if (ld_bind_now && *ld_bind_now) {
         xf86Msg(X_ERROR, "LD_BIND_NOW is set, dlloader will NOT work!\n");
     }
-#endif
 
     LoaderAddSymbols(-1, -1, miLookupTab);
     LoaderAddSymbols(-1, -1, xfree86LookupTab);
@@ -1001,11 +999,7 @@ LoaderSymbol(const char *sym)
     if (item)
 	return item->address;
     else
-#ifdef DLOPEN_SUPPORT
 	return (DLFindSymbol(sym));
-#else
-	return NULL;
-#endif
 }
 
 int
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 8105abb52..10bd2ef59 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -413,11 +413,7 @@ FindModule(const char *module, const char *dir, const char **subdirlist,
     int dirlen;
     const char **subdirs = NULL;
     const char **s;
-#ifdef DLOPEN_HACK
     const char suffix[3][3] = { "so", "a", "o" };
-#else
-    const char suffix[3][3] = { "a", "o", "so" };
-#endif
 
 #ifndef __EMX__
     dirpath = (char *)dir;