frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ditch more alternate-loader braindamage.

This commit is contained in:
Daniel Stone 2006-06-01 20:22:39 +00:00
parent c946817748
commit 6d594ebc66
7 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -41,9 +41,12 @@
Ignore requests to load deprecated GLcore and speedo modules Ignore requests to load deprecated GLcore and speedo modules
(properly, this time). (properly, this time).
* configure.ac:
* hw/xfree86/common/xf86Globals.c:
* hw/xfree86/loader/Makefile.am: * hw/xfree86/loader/Makefile.am:
* hw/xfree86/loader/loader.c: * hw/xfree86/loader/loader.c:
* hw/xfree86/loader/loader.h: * hw/xfree86/loader/loader.h:
* hw/xfree86/loader/loadmod.c:
* hw/xfree86/loader/ar.h: * hw/xfree86/loader/ar.h:
* hw/xfree86/loader/aout.h: * hw/xfree86/loader/aout.h:
* hw/xfree86/loader/aoutloader.h: * hw/xfree86/loader/aoutloader.h:
@ -54,6 +57,8 @@
* hw/xfree86/loader/elf.h: * hw/xfree86/loader/elf.h:
* hw/xfree86/loader/elfloader.h: * hw/xfree86/loader/elfloader.h:
* hw/xfree86/loader/elfloader.c: * 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 Kill the a.out, ELF and COFF loaders with extreme prejudice. Good
riddance. There's more where this came from, too. riddance. There's more where this came from, too.

4
configure.ac
View File

@ -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_TYPES, 1, [Need XFree86 typedefs])
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) 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(WITH_VGAHW, 1, [Building vgahw module])
AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)]) AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)])
AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)]) AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)])

7
hw/xfree86/common/xf86Globals.c
View File

@ -247,10 +247,3 @@ RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
_X_EXPORT Bool xf86inSuspend = FALSE; _X_EXPORT Bool xf86inSuspend = FALSE;
Bool xorgHWAccess = FALSE; Bool xorgHWAccess = FALSE;
PciBusId xf86IsolateDevice; 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

6
hw/xfree86/loader/loader.c
View File

@ -282,12 +282,10 @@ LoaderInit(void)
{ {
const char *osname = NULL; const char *osname = NULL;
#ifdef DLOPEN_SUPPORT
char *ld_bind_now = getenv("LD_BIND_NOW"); char *ld_bind_now = getenv("LD_BIND_NOW");
if (ld_bind_now && *ld_bind_now) { if (ld_bind_now && *ld_bind_now) {
xf86Msg(X_ERROR, "LD_BIND_NOW is set, dlloader will NOT work!\n"); xf86Msg(X_ERROR, "LD_BIND_NOW is set, dlloader will NOT work!\n");
} }
#endif
LoaderAddSymbols(-1, -1, miLookupTab); LoaderAddSymbols(-1, -1, miLookupTab);
LoaderAddSymbols(-1, -1, xfree86LookupTab); LoaderAddSymbols(-1, -1, xfree86LookupTab);
@ -1001,11 +999,7 @@ LoaderSymbol(const char *sym)
if (item) if (item)
return item->address; return item->address;
else else
#ifdef DLOPEN_SUPPORT
return (DLFindSymbol(sym)); return (DLFindSymbol(sym));
#else
return NULL;
#endif
} }
int int

4
hw/xfree86/loader/loadmod.c
View File

@ -413,11 +413,7 @@ FindModule(const char *module, const char *dir, const char **subdirlist,
int dirlen; int dirlen;
const char **subdirs = NULL; const char **subdirs = NULL;
const char **s; const char **s;
#ifdef DLOPEN_HACK
const char suffix[3][3] = { "so", "a", "o" }; const char suffix[3][3] = { "so", "a", "o" };
#else
const char suffix[3][3] = { "a", "o", "so" };
#endif
#ifndef __EMX__ #ifndef __EMX__
dirpath = (char *)dir; dirpath = (char *)dir;

6
include/xorg-config.h.in
View File

@ -30,12 +30,6 @@
/* URL to go to for support. */ /* URL to go to for support. */
#undef __VENDORDWEBSUPPORT__ #undef __VENDORDWEBSUPPORT__
/* Prefer dlloader modules to elfloader */
#undef DLOPEN_HACK
/* Use libdl-based loader. */
#undef DLOPEN_SUPPORT
/* Built-in output drivers. */ /* Built-in output drivers. */
#undef DRIVERS #undef DRIVERS

6
include/xorg-server.h.in
View File

@ -28,12 +28,6 @@
/* Use OsVendorInit */ /* Use OsVendorInit */
#undef DDXOSINIT #undef DDXOSINIT
/* Prefer dlloader modules to elfloader */
#undef DLOPEN_HACK
/* Building with libdl */
#undef DLOPEN_SUPPORT
/* Build DPMS extension */ /* Build DPMS extension */
#undef DPMSExtension #undef DPMSExtension