Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
On Thu, Sep 16, 1999 at 02:14:30PM +0200, Sven LUTHER wrote:
> On Thu, Sep 16, 1999 at 09:24:17AM +0200, Sven LUTHER wrote:
> >
>
>
> Oops a little mistake came up because of the haste, correct patch is attached
> ...
And another mistake in the patch, should have waited a bit more before posting,
but since i was going away, i wanted to make things available.
Anyway, the build process breaks again læter, didn't have time to check it out
though.
So the correct patch for the mach64 stuff follows.
Friendly,
Sven LUTHER
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c.orig Wed Sep 15 17:01:53 1999
+++ xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c Wed Sep 15 17:03:55 1999
@@ -76,11 +76,12 @@
unsigned int integer;
unsigned char bytes[4];
};
-
+/* Also defined in regmach64.h ...
static __inline__ void regwbe(volatile unsigned long regindex, unsigned long regdata)
{
*(unsigned long *)(mach64MemReg + regindex) = regdata;
}
+*/
static __inline__ unsigned int bit_reverse32(unsigned int bits)
{
--- xc/programs/Xserver/hw/xfree68/mach64/Imakefile.orig Wed Sep 15 18:24:42 1999
+++ xc/programs/Xserver/hw/xfree68/mach64/Imakefile Wed Sep 15 18:25:04 1999
@@ -49,7 +49,7 @@
LinkSourceFile(mach64pntwn.c,../../xfree86/accel/mach64)
LinkSourceFile(mach64seg.c,../../xfree86/accel/mach64)
LinkSourceFile(mach64text.c,../../xfree86/accel/mach64)
-LinkSourceFile(mach64util.c,../../xfree86/accel/mach64)
+LinkSourceFile(mach64util.h,../../xfree86/accel/mach64)
LinkSourceFile(mach64win.c,../../xfree86/accel/mach64)
LinkSourceFile(regmach64.h,../../xfree86/accel/mach64)
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.h.orig Thu Sep 16 07:34:58 1999
+++ xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.h Thu Sep 16 07:38:08 1999
@@ -143,6 +143,7 @@
#endif /* __sparc__ */
+#ifndef __powerpc__
extern __inline__ void regw(unsigned int regindex, unsigned long regdata)
{
unsigned long appaddr;
@@ -175,6 +176,7 @@
return (*(__volatile__ int *)appaddr);
#endif
}
+#endif /* __powerpc__ */
extern __inline__ void regwb(unsigned int regindex, unsigned char regdata)
{
Reply to: