Hi Branden, can you please add these patches for your next version. It seems they are all that is needed to get X4.0 built on m68k. If my machine hadn't crashed three times in a row during the install target, I might have tested them already. Anyhow, the patches shouldn't do any harm to non-m68k build. Christian
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c.orig Wed Jun 14 21:41:25 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c Fri Jul 28 19:33:59 2000
@@ -150,7 +150,7 @@
return ret;
}
-#elif defined(__powerpc__) || defined(__sparc__) || defined(__mips__)
+#elif defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__mc68000__)
/* XXX this isn't exactly correct but it will get the server working
* for now until we get something better.
--- xc/programs/Xserver/hw/xfree86/os-support/Imakefile.orig Sat Jul 1 01:39:11 2000 +++ xc/programs/Xserver/hw/xfree86/os-support/Imakefile Thu Aug 10 22:31:09 2000 @@ -12,6 +12,7 @@ #if defined(i386Architecture) || defined(ia64Architecture) || \ (defined(LinuxArchitecture) && defined(AlphaArchitecture)) || \ + (defined(LinuxArchitecture) && defined(Mc68020Architecture)) || \ (defined(FreeBSDArchitecture) && defined(AlphaArchitecture)) || \ defined(PpcArchitecture) || defined(SparcArchitecture) || \ (defined(LinuxArchitecture) && defined(MipsArchitecture))
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Tue Nov 14 23:30:56 2000 +++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h Thu Nov 16 19:54:18 2000 @@ -136,7 +136,7 @@ /* * Select architecture specific PCI init function */ -#if (defined(__powerpc__) || defined(__mips__)) && defined(linux) +#if (defined(__powerpc__) || defined(__mips__) || defined(__mc68000__)) && defined(linux) # define ARCH_PCI_INIT linuxPciInit # define INCLUDE_XF86_MAP_PCI_MEM #elif defined(__powerpc__)
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig Wed Jun 14 21:41:23 2000 +++ xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile Sun Nov 19 22:07:02 2000 @@ -23,7 +23,7 @@ SBUSDRVSRC = linuxSbus.c SBUSDRVOBJ = linuxSbus.o -#elif defined(LinuxArchitecture) && (defined(PpcArchitecture) || defined(MipsArchitecture)) +#elif defined(LinuxArchitecture) && (defined(PpcArchitecture) || defined(MipsArchitecture) || defined(Mc68020Architecture)) XCOMM generic linux PCI driver (using /proc/bus/pci, requires kernel 2.2)
--- xc/programs/Xserver/hw/xfree86/Imakefile.orig Sun Nov 19 22:22:02 2000
+++ xc/programs/Xserver/hw/xfree86/Imakefile Mon Nov 20 18:10:02 2000
@@ -69,7 +69,8 @@
#if !defined(OsfArchitecture) && !defined(AmoebaArchitecture) && \
!defined(ArcArchitecture) && !defined(Arm32Architecture) && \
- !defined(PpcArchitecture) && !defined(MipsArchitecture)
+ !defined(PpcArchitecture) && !defined(MipsArchitecture) && \
+ !defined(Mc68020Architecture)
SUPERPROBE = SuperProbe
#endif
Attachment:
pgp7HCC7yy2us.pgp
Description: PGP signature