[xserver-commit] xizzle/loader Makefile.am,1.4,1.5 loader.c,1.73,1.74

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xizzle/loader
In directory pdx:/tmp/cvs-serv2395/loader

Modified Files:
	Makefile.am loader.c 
Log Message:
The number of link errors is dwindling ...

loader.c TODO: force usage of libdl functions, always.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xizzle/loader/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/Makefile.am	7 Mar 2004 11:58:13 -0000	1.4
+++ b/Makefile.am	7 Mar 2004 12:42:30 -0000	1.5
@@ -3,5 +3,4 @@
 
 lib_LIBRARIES = libxizzleloader.a
 libxizzleloader_a_SOURCES = dlloader.c hash.c loader.c loadmod.c loadfont.c \
-                          loadext.c os.c dixsym.c misym.c \
-                          extsym.c $(SPARCSRCS)
+                          loadext.c os.c $(SPARCSRCS)

Index: loader.c
===================================================================
RCS file: /cvs/xserver/xizzle/loader/loader.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- a/loader.c	28 Feb 2004 01:27:52 -0000	1.73
+++ b/loader.c	7 Mar 2004 12:42:30 -0000	1.74
@@ -267,64 +267,18 @@
  */
 
 static loader_funcs funcs[] = {
-    /* LD_ARCHIVE */
-    {ARCHIVELoadModule,
-     ARCHIVEResolveSymbols,
-     ARCHIVECheckForUnresolved,
-     ARCHIVEAddressToSection,
-     ARCHIVEUnload, {0, 0, 0, 0, 0}},
-    /* LD_ELFOBJECT */
-    {ELFLoadModule,
-     ELFResolveSymbols,
-     ELFCheckForUnresolved,
-     ELFAddressToSection,
-     ELFUnloadModule, {0, 0, 0, 0, 0}},
-    /* LD_COFFOBJECT */
-    {COFFLoadModule,
-     COFFResolveSymbols,
-     COFFCheckForUnresolved,
-     COFFAddressToSection,
-     COFFUnloadModule, {0, 0, 0, 0, 0}},
-    /* LD_XCOFFOBJECT */
-    {COFFLoadModule,
-     COFFResolveSymbols,
-     COFFCheckForUnresolved,
-     COFFAddressToSection,
-     COFFUnloadModule, {0, 0, 0, 0, 0}},
-    /* LD_AOUTOBJECT */
-    {AOUTLoadModule,
-     AOUTResolveSymbols,
-     AOUTCheckForUnresolved,
-     AOUTAddressToSection,
-     AOUTUnloadModule, {0, 0, 0, 0, 0}},
     /* LD_AOUTDLOBJECT */
-#ifdef DLOPEN_SUPPORT
     {DLLoadModule,
      DLResolveSymbols,
      DLCheckForUnresolved,
      ARCHIVEAddressToSection,
      DLUnloadModule, {0, 0, 0, 0, 0}},
-#else
-    {AOUTLoadModule,
-     AOUTResolveSymbols,
-     AOUTCheckForUnresolved,
-     AOUTAddressToSection,
-     AOUTUnloadModule, {0, 0, 0, 0, 0}},
-#endif
     /* LD_ELFDLOBJECT */
-#ifdef DLOPEN_SUPPORT
     {DLLoadModule,
      DLResolveSymbols,
      DLCheckForUnresolved,
      ARCHIVEAddressToSection,
      DLUnloadModule, {0, 0, 0, 0, 0}},
-#else
-    {ELFLoadModule,
-     ELFResolveSymbols,
-     ELFCheckForUnresolved,
-     ELFAddressToSection,
-     ELFUnloadModule, {0, 0, 0, 0, 0}},
-#endif
 };
 
 int numloaders = sizeof(funcs) / sizeof(loader_funcs);
@@ -334,6 +288,7 @@
 {
     const char *osname = NULL;
 
+/*  Is the SPARC stuff worthwhile? -ds
     LoaderAddSymbols(-1, -1, miLookupTab);
     LoaderAddSymbols(-1, -1, xfree86LookupTab);
     LoaderAddSymbols(-1, -1, dixLookupTab);
@@ -346,7 +301,7 @@
     else
 #endif
 	LoaderAddSymbols(-1, -1, SparcLookupTab);
-#endif
+#endif */
 
     xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n");
     xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC,
@@ -1321,6 +1276,7 @@
 void *
 LoaderSymbol(const char *sym)
 {
+/* I really dislike this function. -ds
     int i;
     itemPtr item = NULL;
 
@@ -1331,12 +1287,8 @@
 
     if (item)
 	return item->address;
-    else
-#ifdef DLOPEN_SUPPORT
+    else */
 	return (DLFindSymbol(sym));
-#else
-	return NULL;
-#endif
 }
 
 int