tech-x11 archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: X server support?
Hi! Michael,
Sorry, I forgot to attach patch...
From: Michael <macallan%netbsd.org@localhost>
Date: Sun, 28 Sep 2008 18:54:15 -0400
> On Sep 28, 2008, at 2:45 PM, KIYOHARA Takashi wrote:
>
> > From: Michael Lorenz <macallan%netbsd.org@localhost>
> > Date: Wed, 17 Sep 2008 10:25:51 -0400
> >
> >> That's a known problem, Magnus Henoch posted a workaround on port-
> >> macppc a while ago ( it 's a hack in ld.so_elf / rtld.c and avoids
> >> using __builtin_return_addr(0) which occasionally returns bogus on
> >> powerpc, so far xorg's module loader is the only known program that
> >> triggers it. I'm not aware of a similar problem on any other CPU
> >> architecture though.
> >
> > I see this message now.
> >
> > (II) Loading /usr/X11R6/lib/modules/libpcidata.a I am at 0x186fad8
> > (EE) LoadModule: Module pcidata does not have a pcidataModuleData
> > data object.
> > (II) UnloadModule: "pcidata"
> > (II) Unloading /usr/X11R6/lib/modules/libpcidata.a
> > (EE) Failed to load module "pcidata" (invalid module, 0)
> >
> > Fatal server error:
> > Unable to load required probe modules, Exiting...
> >
> >
> > I was not found though looked for pcidataModuleData.
> >
> > # grep pcidataModuleData obj/powerpc/destdir.bebox/usr/X11R6/lib/
> > modules/libpcidata.a
> >
> > (on i386)
> > # grep pcidataModuleData /usr/X11R6/lib/modules/libpcidata.a
> > Binary file /usr/X11R6/lib/modules/libpcidata.a matches
> >
> >
> > And, I learnt xf86ScanPci.c had pcidataModuleData. However, it is
> > necessary to define -DXFree86LOADER as for this. And, XFree86LOADER
> > is not defined according to build-log of xf86ScanPci.c.
> >
> > # compile pcidata/xf86PciData.o
> > /usr/src/cross/powerpc/bin/powerpc--netbsd-gcc -O2 -Werror -fno-
> > strict-aliasing -DSHAPE -DXKB -DLBX -DXAPPGROUP -DXCSECURITY -
> > DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV -DPANORAMIX -
> > DRENDER -DRANDR -DGCCUSESGAS -DAVOID_GLYPHBLT -DSINGLEDEPTH -
> > DXvExtension -DXFree86Server -DXvMCExtension -DSMART_SCHEDULE -
> > DBUILDDEBUG -DXResExtension -DNDEBUG -DXINPUT -DXFreeXDGA -
> > DXF86VIDMODE -DX_BYTE_ORDER=X_BIG_ENDIAN -I/usr/xsrc/xfree/xc/
> > programs/Xserver/hw/xfree86/common -I/usr/xsrc/xfree/xc/programs/
> > Xserver/hw/xfree86/os-support -I/usr/xsrc/xfree/xc/programs/Xserver/
> > hw/xfree86/os-support/bus -I/usr/xsrc/xfree/xc/programs/Xserver/
> > include -I/usr/xsrc/xfree/xc/programs/Xserver/os -I/usr/src/obj/
> > powerpc/destdir.bebox/usr/X11R6/include/X11 -I/usr/xsrc/xfree/xc/
> > programs/Xserver/Xext -I/usr/src/obj/powerpc/destdir.bebox/usr/
> > X11R6/include/X11/extensions -I/usr/xsrc/xfree/xc/programs/Xserver/
> > Xi -I/usr/xsrc/xfree/xc/lib/font/include -I/usr/xsrc/xfree/xc/
> > programs/Xserver/hw!
> > /xfree86/parser -I/usr/xsrc/xfree/xc/programs/Xserver/hw/xfree86/
> > loader -I/usr/xsrc/xfree/xc/programs/Xserver/rac -I/usr/xsrc/xfree/
> > xc/programs/Xserver/hw/xfree86/scanpci -I/usr/src/obj/powerpc/x11/
> > Xserver/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -I/usr/src/
> > obj/powerpc/destdir.bebox/usr/X11R6/include -nostdinc -isystem /
> > usr/src/obj/powerpc/destdir.bebox/usr/include -c -DPCIDATA
> > xf86PciData.c -o xf86PciData.o
> >
> >
> > Is this cause understood?
>
> That's nothing powerpc-specific anymore - looks like libpcidata wasn't
> built as dynamic module.
> Let's continue this on tech-x11@
hmm...
I will re-post to tech-x11@... X-<
Thanks,
--
kiyohara
Index: x11/Xserver/Makefile.common
===================================================================
RCS file: /cvsroot/src/x11/Xserver/Makefile.common,v
retrieving revision 1.34
diff -u -r1.34 Makefile.common
--- x11/Xserver/Makefile.common 8 Mar 2008 10:38:59 -0000 1.34
+++ x11/Xserver/Makefile.common 28 Sep 2008 18:05:29 -0000
@@ -49,7 +49,8 @@
${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE} == "sparc64" || \
${MACHINE} == "sparc" || ${MACHINE} == "ofppc" || \
- ${MACHINE} == "netwinder" || ${MACHINE} == "shark"
+ ${MACHINE} == "netwinder" || ${MACHINE} == "shark" || \
+ ${MACHINE} == "bebox" || ${MACHINE} == "prep"
XSERVER_NEEDS_XFONT= yes
XSERVER_NEEDS_MIEXT= yes
XSERVER_XFREE86= yes
Index: x11/Xserver/hw/xfree86/drivers/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- x11/Xserver/hw/xfree86/drivers/Makefile 8 Mar 2008 10:38:59 -0000
1.22
+++ x11/Xserver/hw/xfree86/drivers/Makefile 28 Sep 2008 18:05:30 -0000
@@ -11,7 +11,8 @@
SUBDIR+= i740 i810 neomagic via vmware
.endif
-.if ${MACHINE} != "macppc" && ${MACHINE} != "sgimips" && ${MACHINE} != "ofppc"
+.if ${MACHINE} != "macppc" && ${MACHINE} != "sgimips" && \
+ ${MACHINE} != "ofppc" && ${MACHINE} != "bebox" && ${MACHINE} != "prep"
SUBDIR+= apm ark cirrus cyrix dummy i128 nsc \
rendition siliconmotion tga tseng vesa
.endif
Index: x11/Xserver/hw/xfree86/drivers/ati/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/ati/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- x11/Xserver/hw/xfree86/drivers/ati/Makefile 8 Mar 2008 10:38:59 -0000
1.6
+++ x11/Xserver/hw/xfree86/drivers/ati/Makefile 28 Sep 2008 18:05:30 -0000
@@ -57,7 +57,8 @@
# XXX from the Imakefile
# -DAVOID_NON_PCI must be defined for those platforms that do not
# tolerate PCI master aborts.
-.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "bebox" || ${MACHINE} == "prep"
CPPFLAGS+= -DAVOID_NON_PCI
.endif
Index: x11/Xserver/hw/xfree86/drivers/atimisc/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- x11/Xserver/hw/xfree86/drivers/atimisc/Makefile 8 Mar 2008 10:38:59
-0000 1.5
+++ x11/Xserver/hw/xfree86/drivers/atimisc/Makefile 28 Sep 2008 18:05:30
-0000
@@ -67,7 +67,8 @@
# XXX from the Imakefile
# -DAVOID_NON_PCI must be defined for those platforms that do not
# tolerate PCI master aborts.
-.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "bebox" || ${MACHINE} == "prep"
CPPFLAGS+= -DAVOID_NON_PCI
.endif
Index: x11/Xserver/hw/xfree86/drivers/chips/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/chips/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- x11/Xserver/hw/xfree86/drivers/chips/Makefile 8 Mar 2008 10:38:59
-0000 1.5
+++ x11/Xserver/hw/xfree86/drivers/chips/Makefile 28 Sep 2008 18:05:30
-0000
@@ -42,7 +42,8 @@
CPPFLAGS+= -DPSZ=8
-.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "bebox" || ${MACHINE} == "prep"
CPPFLAGS+= -DNO_VBE
.endif
Index: x11/Xserver/hw/xfree86/drivers/glint/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/glint/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- x11/Xserver/hw/xfree86/drivers/glint/Makefile 8 Mar 2008 10:39:00
-0000 1.5
+++ x11/Xserver/hw/xfree86/drivers/glint/Makefile 28 Sep 2008 18:05:30
-0000
@@ -14,7 +14,8 @@
TIramdac.c glint_shadow.c sx_accel.c glint_dga.c
.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "macppc" || \
- ${MACHINE} == "ofppc"
+ ${MACHINE} == "ofppc" || ${MACHINE} == "bebox" || \
+ ${MACHINE} == "prep"
CPPFLAGS+= -DGLINT_AVOID_INT10
.endif
Index: x11/Xserver/hw/xfree86/drivers/r128/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/drivers/r128/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- x11/Xserver/hw/xfree86/drivers/r128/Makefile 8 Mar 2008 10:39:00
-0000 1.6
+++ x11/Xserver/hw/xfree86/drivers/r128/Makefile 28 Sep 2008 18:05:30
-0000
@@ -52,7 +52,8 @@
.endif
.if ${MACHINE} == "macppc" || ${MACHINE} == "sparc" || \
- ${MACHINE} == "sparc64" || ${MACHINE} == "ofppc"
+ ${MACHINE} == "sparc64" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "bebox" || ${MACHINE} == "prep"
CPPFLAGS+= -DAVOID_VGAHW
.endif
Index: x11/Xserver/hw/xfree86/xf86/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/xf86/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- x11/Xserver/hw/xfree86/xf86/Makefile 8 Mar 2008 10:39:00 -0000
1.11
+++ x11/Xserver/hw/xfree86/xf86/Makefile 28 Sep 2008 18:05:36 -0000
@@ -22,7 +22,8 @@
CPPFLAGS+=-DUSE_MODULAR_KBD
.endif
-.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "bebox" || ${MACHINE} == "prep"
CPPFLAGS+=-DUSE_MODULAR_KBD
.endif
Index: x11/Xserver/hw/xfree86/xf86_os/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/hw/xfree86/xf86_os/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- x11/Xserver/hw/xfree86/xf86_os/Makefile 23 Apr 2008 05:13:43 -0000
1.19
+++ x11/Xserver/hw/xfree86/xf86_os/Makefile 28 Sep 2008 18:05:36 -0000
@@ -30,7 +30,8 @@
.endfor
.endif
-.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "bebox" || ${MACHINE} == "prep"
SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC \
@@ -85,11 +86,13 @@
.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE} == "sparc64" || \
${MACHINE} == "sparc" || ${MACHINE} == "netwinder" || \
- ${MACHINE} == "shark" || ${MACHINE} == "ofppc"
+ ${MACHINE} == "shark" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "bebox" || ${MACHINE} == "prep"
SRCS.bus+= netbsdPci.c
.endif
-.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "bebox" || ${MACHINE} == "prep"
.for _FN in ${SRCS.bus}
CPPFLAGS.${_FN}= -DPCI_VIA_TTYE0
.endfor
@@ -109,7 +112,8 @@
${MACHINE} == "cats" || ${MACHINE} == "sgimips" || \
${MACHINE} == "sparc64" || ${MACHINE} == "sparc" || \
${MACHINE} == "netwinder" || ${MACHINE} == "shark" || \
- ${MACHINE} == "ofppc"
+ ${MACHINE} == "ofppc" || ${MACHINE} == "bebox" || \
+ ${MACHINE} == "prep"
SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
.endif
Home |
Main Index |
Thread Index |
Old Index