Re: xfree86-1_3.3.4 now compiles on powerpc, mach64 mess fixed, patch included.
On Thu, 16 Sep 1999, Sven LUTHER wrote:
> On Thu, Sep 16, 1999 at 05:12:39AM -0400, Ben Collins wrote:
> > On Thu, Sep 16, 1999 at 02:14:30PM +0200, Sven LUTHER wrote:
> > > ---
> > > /home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c.orig Thu Sep 16 07:34:58 1999
> > > +++
> > > /home/luther/Xfree/3.3/debian/xfree86-1-3.3.4/build-tree/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c 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)
> > > {
> >
> > I'm not sure this is going to work for sparc, I need to test this out again.
> > I think alot of the mach64 stuff that is #if'd for powerpc could be done for
> > sparc to use it too (the regwb() is one of them).
>
> Have a look at it. I will be away until monday evening, so i can test
> what you come up with. Anyway, best would be to put all the regxxx
> stuff in the same file, and all the different arch version in the same
> function also, like it was started to do with regwbe.
Hmm. Does this patch (what I've been using for 3.3.5 rpms) look alright
all around?
---
Tom Rini (TR1265)
http://gate.crashing.org/~trini/
--- xc/programs/Xserver/hw/xfree68/mach64/Imakefile.orig Thu Sep 2 17:23:15 1999
+++ xc/programs/Xserver/hw/xfree68/mach64/Imakefile Thu Sep 2 17:23:38 1999
@@ -44,6 +44,7 @@
LinkSourceFile(mach64text.c,../../xfree86/accel/mach64)
LinkSourceFile(mach64win.c,../../xfree86/accel/mach64)
LinkSourceFile(regmach64.h,../../xfree86/accel/mach64)
+LinkSourceFile(mach64util.h,../../xfree86/accel/mach64)
InstallLinkKitLibrary(mach64,$(LINKKITDIR)/drivers)
--- xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.h.orig Thu Sep 2 20:00:27 1999
+++ xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.h Thu Sep 2 20:09:31 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: