From cd384af3058fe15077c57eccdffed3b61e261e7f Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 3 Jun 2006 10:50:23 +0000
Subject: [PATCH] Completely remove relocation pointer table.

---
 ChangeLog                  |  4 ++++
 hw/xfree86/loader/loader.c | 14 +-------------
 hw/xfree86/loader/loader.h | 11 -----------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b16753ef..8ec2d78b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 	* hw/xfree86/os-support/bus/Pci.h:
 	Add support for kFreeBSD systems.  (Robert Millan, Aurelien Jarno)
 
+	* hw/xfree86/loader/loader.h:
+	* hw/xfree86/loader/loader.c:
+	Completely remove relocation pointer tables.
+
 2006-06-01  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/xfree86/common/xf86Init.c:
diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index dc474c477..49546ec81 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -272,7 +272,7 @@ static loader_funcs funcs[] = {
      DLResolveSymbols,
      DLCheckForUnresolved,
      ARCHIVEAddressToSection,
-     DLUnloadModule, {0, 0}},
+     DLUnloadModule},
 };
 
 int numloaders = sizeof(funcs) / sizeof(loader_funcs);
@@ -843,18 +843,6 @@ _LoaderHandleUnresolved(char *symbol, char *module)
  * Relocation list manipulation routines
  */
 
-/*
- * _LoaderGetRelocations() Return the list of outstanding relocations
- */
-LoaderRelocPtr
-_LoaderGetRelocations(void *mod)
-{
-    loader_funcs *formatrec = (loader_funcs *) mod;
-
-    return &(formatrec->pRelocs);
-}
-
-
 /*
  * Public Interface to the loader.
  */
diff --git a/hw/xfree86/loader/loader.h b/hw/xfree86/loader/loader.h
index da4663995..63e6715fa 100644
--- a/hw/xfree86/loader/loader.h
+++ b/hw/xfree86/loader/loader.h
@@ -83,11 +83,6 @@
 #define HASHDIV 10
 #define HASHSIZE (1<<HASHDIV)
 
-typedef struct _LoaderReloc {
-    int modtype;
-    struct _LoaderReloc *next;
-} LoaderRelocRec, *LoaderRelocPtr;
-
 typedef struct _loader_item *itemPtr;
 typedef struct _loader_item {
     char *name;
@@ -187,7 +182,6 @@ typedef struct _loader_funcs {
     CheckForUnresolvedProcPtr CheckForUnresolved;
     AddressToSectionProcPtr AddressToSection;
     LoaderUnloadProcPtr LoaderUnload;
-    LoaderRelocRec pRelocs;	/* type specific relocations */
 } loader_funcs;
 
 /* Each module loaded has a loaderRec */
@@ -248,11 +242,6 @@ void *_LoaderFileToMem(int fd, unsigned long offset, int size, char *label);
 void _LoaderFreeFileMem(void *addr, int size);
 int _LoaderFileRead(int fd, unsigned int offset, void *addr, int size);
 
-/*
- * Relocation list manipulation routines
- */
-LoaderRelocPtr _LoaderGetRelocations(void *);
-
 /*
  * object to name lookup routines
  */