Ditch more alternate-loader braindamage.

7 files changed, 5 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 2de439ce3..e69cbb08f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,9 +41,12 @@
 	Ignore requests to load deprecated GLcore and speedo modules
 	(properly, this time).
 
+	* configure.ac:
+	* hw/xfree86/common/xf86Globals.c:
 	* hw/xfree86/loader/Makefile.am:
 	* hw/xfree86/loader/loader.c:
 	* hw/xfree86/loader/loader.h:
+	* hw/xfree86/loader/loadmod.c:
 	* hw/xfree86/loader/ar.h:
 	* hw/xfree86/loader/aout.h:
 	* hw/xfree86/loader/aoutloader.h:
@@ -54,6 +57,8 @@
 	* hw/xfree86/loader/elf.h:
 	* hw/xfree86/loader/elfloader.h:
 	* hw/xfree86/loader/elfloader.c:
+	* include/xorg-config.h.in:
+	* include/xorg-server.h.in:
 	Kill the a.out, ELF and COFF loaders with extreme prejudice.  Good
 	riddance.  There's more where this came from, too.
 
diff --git a/configure.ac b/configure.ac
index 041253c06..43dbf464c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1254,10 +1254,6 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-	# XXX HACK!  if anyone cares about elfloader in 7.0 you need to
-	# XXX do something smarter here.
-	AC_DEFINE(DLOPEN_HACK, 1, [Prefer dlloader modules to elfloader])
-	AC_DEFINE(DLOPEN_SUPPORT, 1, [Use libdl-based loader])
 	AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
 	AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)])
 	AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)])
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;
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index 9833fd4bb..a5074f6e1 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -30,12 +30,6 @@
 /* URL to go to for support. */
 #undef __VENDORDWEBSUPPORT__
 
-/* Prefer dlloader modules to elfloader */
-#undef DLOPEN_HACK
-
-/* Use libdl-based loader. */
-#undef DLOPEN_SUPPORT
-
 /* Built-in output drivers. */
 #undef DRIVERS
 
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 69c6102b3..f31d98a77 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -28,12 +28,6 @@
 /* Use OsVendorInit */
 #undef DDXOSINIT
 
-/* Prefer dlloader modules to elfloader */
-#undef DLOPEN_HACK
-
-/* Building with libdl */
-#undef DLOPEN_SUPPORT
-
 /* Build DPMS extension */
 #undef DPMSExtension