Reviewed-by: Jeremy Huddleston <[email protected]> On Sep 14, 2011, at 5:25 PM, Aaron Plattner wrote:
> These symbols were not renamed when they were added to libfb: > > # nm -D libwfb.so | grep ' fb' > 0000000000028d00 T fbTrapezoids > 0000000000028d60 T fbTriangles > > This causes corruption and/or crashes on wfb-ful drivers like nvidia: > > Program received signal SIGABRT, Aborted. > 0x00007fd67f3a0405 in *__GI_raise (sig=<optimized out>) at > ../nptl/sysdeps/unix/sysv/linux/raise.c:64 > 64 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory. > in ../nptl/sysdeps/unix/sysv/linux/raise.c > (gdb) bt > #0 0x00007fd67f3a0405 in *__GI_raise (sig=<optimized out>) at > ../nptl/sysdeps/unix/sysv/linux/raise.c:64 > #1 0x00007fd67f3a3680 in *__GI_abort () at abort.c:92 > #2 0x00007fd67f3995b1 in *__GI___assert_fail (assertion=0x7fd679ecb804 > "key->initialized", file=<optimized out>, line=116, function=0x7fd679ecbbc0 > "dixGetPrivateAddr") > at assert.c:81 > #3 0x00007fd679ec55b6 in ?? () from /usr/lib/xorg/modules/libfb.so > #4 0x00007fd679eca9ef in ?? () from /usr/lib/xorg/modules/libfb.so > #5 0x00007fd679ecae20 in fbTriangles () from /usr/lib/xorg/modules/libfb.so > #6 0x00007fd67a58fc55 in ?? () from > /usr/lib/xorg/modules/drivers/nvidia_drv.so > #7 0x00000000004f38d1 in ?? () > #8 0x0000000000437ae9 in ?? () > #9 0x0000000000426eaa in ?? () > #10 0x00007fd67f38cead in __libc_start_main (main=<optimized out>, > argc=<optimized out>, ubp_av=<optimized out>, init=<optimized out>, > fini=<optimized out>, > rtld_fini=<optimized out>, stack_end=0x7fff99860d78) at libc-start.c:228 > #11 0x000000000042719d in _start () > > Signed-off-by: Aaron Plattner <[email protected]> > --- > fb/wfbrename.h | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/fb/wfbrename.h b/fb/wfbrename.h > index e855edd..8b896eb 100644 > --- a/fb/wfbrename.h > +++ b/fb/wfbrename.h > @@ -160,6 +160,8 @@ > #define fbStippleTable wfbStippleTable > #define fbTile wfbTile > #define fbTransparentSpan wfbTransparentSpan > +#define fbTrapezoids wfbTrapezoids > +#define fbTriangles wfbTriangles > #define fbUninstallColormap wfbUninstallColormap > #define fbUnmapWindow wfbUnmapWindow > #define fbUnrealizeFont wfbUnrealizeFont > -- > 1.7.4.1 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > --- Jeremy Huddleston Rebuild Sudan - Board of Directors - http://www.rebuildsudan.org Berkeley Foundation for Opportunities in Information Technology - Advisory Board - http://www.bfoit.org _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
