Index: programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v
retrieving revision 1.3
diff -u -r1.3 apm_accel.c
--- programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c	30 Jul 2004 20:30:51 -0000	1.3
+++ programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c	1 Aug 2004 13:53:59 -0000
@@ -73,7 +73,11 @@
     static StippleScanlineProcPtr *StippleTab = NULL;
 
     if (!StippleTab)
+#ifdef XFree86LOADER
         StippleTab = LoaderSymbol("XAAStippleScanlineFuncMSBFirst");
+#else
+	StippleTab = XAAStippleScanlineFuncMSBFirst;
+#endif
 
     for (i = 0; i < APM_CACHE_NUMBER; i++)
 	if ((pApm->apmCache[i].apmStippleCache.serialNumber == pPix->drawable.serialNumber)
Index: programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v
retrieving revision 1.3
diff -u -r1.3 apm_funcs.c
--- programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c	30 Jul 2004 20:30:51 -0000	1.3
+++ programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c	1 Aug 2004 13:55:25 -0000
@@ -717,7 +717,11 @@
     static GlyphScanlineFuncPtr *GlyphTab = NULL;
     int w2, h2, dwords;
 
+#ifdef XFree86LOADER
     if (!GlyphTab) GlyphTab = LoaderSymbol("XAAGlyphScanlineFuncLSBFirst");
+#else
+    if (!GlyphTab) GlyphTab = XAAGlyphScanlineFuncLSBFirst;
+#endif
     GlyphFunc = GlyphTab[glyphWidth - 1];
 
     w2 = w + skipleft;
Index: programs/Xserver/hw/xfree86/drivers/chips/ct_accel.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/drivers/chips/ct_accel.c,v
retrieving revision 1.4
diff -u -r1.4 ct_accel.c
--- programs/Xserver/hw/xfree86/drivers/chips/ct_accel.c	30 Jul 2004 21:36:39 -0000	1.4
+++ programs/Xserver/hw/xfree86/drivers/chips/ct_accel.c	1 Aug 2004 13:52:35 -0000
@@ -1126,7 +1126,11 @@
     unsigned char *data, *srcPtr, *dstPtr;
 
     if (!StippleTab)
+#ifdef XFree86LOADER
         StippleTab = LoaderSymbol("XAAStippleScanlineFuncMSBFirst");
+#else
+    	StippleTab = XAAStippleScanlineFuncMSBFirst;
+#endif
 
     DEBUG_P("CacheMonoStipple");
     if((h <= 128) && (w <= 128 * bpp / 8)) {
Index: programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c,v
retrieving revision 1.5
diff -u -r1.5 glint_driver.c
--- programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c	31 Jul 2004 01:21:18 -0000	1.5
+++ programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c	1 Aug 2004 13:45:54 -0000
@@ -933,7 +933,11 @@
     pGlint->RamDacRec->WriteAddress = glintTIWriteAddress;
     pGlint->RamDacRec->ReadData = glintTIReadData;
     pGlint->RamDacRec->WriteData = glintTIWriteData;
+#ifdef XFree86LOADER
     pGlint->RamDacRec->LoadPalette = LoaderSymbol("TIramdacLoadPalette");
+#else
+    pGlint->RamDacRec->LoadPalette = TIramdacLoadPalette;
+#endif
 
     if(!RamDacInit(pScrn, pGlint->RamDacRec)) {
 	RamDacDestroyInfoRec(pGlint->RamDacRec);
Index: programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v
retrieving revision 1.3
diff -u -r1.3 mga_storm.c
--- programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c	30 Jul 2004 20:30:52 -0000	1.3
+++ programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c	1 Aug 2004 13:43:35 -0000
@@ -745,7 +745,11 @@
 	infoPtr->SubsequentScreenToScreenColorExpandFill =
 		MGANAME(SubsequentPlanarScreenToScreenColorExpandFill);
 	infoPtr->CacheColorExpandDensity = PSZ;
+#ifdef XFree86LOADER
 	infoPtr->CacheMonoStipple = LoaderSymbol("XAACachePlanarMonoStipple");
+#else
+	infoPtr->CacheMonoStipple = XAACachePlanarMonoStipple;
+#endif
 	/* It's faster to blit the stipples if you have fastbilt */
 	if(pMga->HasFBitBlt)
 	    infoPtr->ScreenToScreenColorExpandFillFlags = TRANSPARENCY_ONLY;
Index: programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c,v
retrieving revision 1.4
diff -u -r1.4 s3_driver.c
--- programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c	30 Jul 2004 20:30:54 -0000	1.4
+++ programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c	1 Aug 2004 13:47:45 -0000
@@ -662,7 +662,11 @@
 		pS3->DacSave = S3IBMRGB_Save;
 		pS3->DacRestore = S3IBMRGB_Restore;
 		pS3->CursorInit = S3IBMRGB_CursorInit;
+#ifdef XFree86LOADER
 		pS3->RamDac->SetBpp = LoaderSymbol("IBMramdac526SetBpp");
+#else
+		pS3->RamDac->SetBpp = IBMramdac526SetBpp;
+#endif		
 		pS3->MaxClock = 170000;
 		pScrn->rgbBits = 8;
 		pS3->LoadPalette = S3GenericLoadPalette;
Index: programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v
retrieving revision 1.3
diff -u -r1.3 trident_driver.c
--- programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c	30 Jul 2004 20:30:55 -0000	1.3
+++ programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c	1 Aug 2004 13:51:07 -0000
@@ -2034,8 +2034,13 @@
     if (!pScrn->progClock) {
 	pScrn->numClocks = NoClocks;
 	xf86GetClocks(pScrn, NoClocks, TRIDENTClockSelect,
+#ifdef XFree86LOADER
 			  LoaderSymbol("vgaHWProtect"),
 			  LoaderSymbol("vgaHWBlankScreen"),
+#else
+	    		  vgaHWProtect,
+	    		  vgaHWBlankScreen,
+#endif
 			  vgaIOBase + 0x0A, 0x08, 1, 28322);
 	from = X_PROBED;
 	xf86ShowClocks(pScrn, from);
Index: programs/Xserver/hw/xfree86/drivers/vesa/vesa.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c,v
retrieving revision 1.3
diff -u -r1.3 vesa.c
--- programs/Xserver/hw/xfree86/drivers/vesa/vesa.c	30 Jul 2004 20:30:55 -0000	1.3
+++ programs/Xserver/hw/xfree86/drivers/vesa/vesa.c	1 Aug 2004 13:57:37 -0000
@@ -909,17 +909,33 @@
 
 	if (mode->MemoryModel == 3) {	/* Planar */
 	  if (pScrn->bitsPerPixel == 8)
+#ifdef XFree86LOADER
 		update = LoaderSymbol("shadowUpdatePlanar4x8");
+#else
+		update = shadowUpdatePlanar4x8;
+#endif
 	    else
+#ifdef XFree86LOADER
 		update = LoaderSymbol("shadowUpdatePlanar4");
+#else
+		update = shadowUpdatePlanar4;
+#endif
 	    window = VESAWindowPlanar;
 	}
 	else if (pVesa->mapPhys == 0xa0000) {	/* Windowed */
+#ifdef XFree86LOADER
 	    update = LoaderSymbol("shadowUpdatePacked");
+#else
+	    update = shadowUpdatePacked;
+#endif
 	    window = VESAWindowWindowed;
 	}
 	else {	/* Linear */
+#ifdef XFree86LOADER
 	    update = LoaderSymbol("shadowUpdatePacked");
+#else
+	    update = shadowUpdatePacked;
+#endif
 	    window = VESAWindowLinear;
 	}
 
Index: programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v
retrieving revision 1.2
diff -u -r1.2 fbdevhwstub.c
--- programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c	23 Apr 2004 19:54:01 -0000	1.2
+++ programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c	1 Aug 2004 13:37:33 -0000
@@ -168,3 +168,27 @@
 {
 	return FALSE;
 }
+
+xf86SwitchModeProc *
+fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; }
+
+xf86AdjustFrameProc *
+fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; }
+
+xf86EnterVTProc *
+fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; }
+
+xf86LeaveVTProc *
+fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; }
+
+xf86ValidModeProc *
+fbdevHWValidModeWeak(void) { return fbdevHWValidMode; }
+
+xf86DPMSSetProc *
+fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; }
+
+xf86LoadPaletteProc *
+fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; }
+
+SaveScreenProcPtr
+fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; }
Index: programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v
retrieving revision 1.3
diff -u -r1.3 mfbmap.h
--- programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h	30 Jul 2004 20:30:56 -0000	1.3
+++ programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h	1 Aug 2004 13:34:05 -0000
@@ -45,6 +45,7 @@
 #define mfbGetWindowPixmap  xf1bppGetWindowPixmap
 #define mfbGetWindowPrivateIndex  xf1bppGetWindowPrivateIndex
 #define mfbGetmask  xf1bppGetmask
+#define mfbGetpartmasks xf1bppGetpartmasks
 #define mfbGetrmask  xf1bppGetrmask
 #define mfbGetstarttab  xf1bppGetstarttab
 #define mfbGetendtab  xf1bppGetendtab