<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On 18 June 2015 at 19:46, Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div class=""><div class="h5">On 18 June 2015 at 06:53, Julien Isorce <<a href="mailto:julien.isorce@gmail.com">julien.isorce@gmail.com</a>> wrote: > Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=90908" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=90908</a> > Signed-off-by: Julien Isorce <<a href="mailto:j.isorce@samsung.com">j.isorce@samsung.com</a>> > --- > <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 2 +- > src/mesa/x86-64/xform4.S | 53 +++++++++++++++++++++++++----------------------- > src/mesa/x86/assyntax.h | 2 +- > 3 files changed, 30 insertions(+), 27 deletions(-) > > diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> > index ae6d83d..6d699d5 100644 > --- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> > +++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> > @@ -615,7 +615,7 @@ if test "x$enable_asm" = xyes; then > ;; > x86_64|amd64) > case "$host_os" in > - linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*) > + linux* | *freebsd* | dragonfly* | *netbsd* | openbsd* | darwin*) > asm_arch=x86_64 > ;; > esac > diff --git a/src/mesa/x86-64/xform4.S b/src/mesa/x86-64/xform4.S > index c185f62..17eb7fa 100644 > --- a/src/mesa/x86-64/xform4.S > +++ b/src/mesa/x86-64/xform4.S > @@ -24,14 +24,15 @@ > > #ifdef USE_X86_64_ASM > > +#include "x86/assyntax.h" > #include "matypes.h" > > .text > > .align 16 > -.globl _mesa_x86_64_cpuid > -.hidden _mesa_x86_64_cpuid > -_mesa_x86_64_cpuid: > +GLOBL GLNAME(_mesa_x86_64_cpuid) > +HIDDEN(_mesa_x86_64_cpuid) > +GLNAME(_mesa_x86_64_cpuid): > pushq %rbx > movl (%rdi), %eax > movl 8(%rdi), %ecx > @@ -46,9 +47,9 @@ _mesa_x86_64_cpuid: > ret > > .align 16 > -.globl _mesa_x86_64_transform_points4_general > -.hidden _mesa_x86_64_transform_points4_general > -_mesa_x86_64_transform_points4_general: > +GLOBL GLNAME(_mesa_x86_64_transform_points4_general) > +HIDDEN(_mesa_x86_64_transform_points4_general) > +GLNAME(_mesa_x86_64_transform_points4_general): > /* > * rdi = dest > * rsi = matrix > @@ -105,8 +106,10 @@ p4_general_loop: > p4_general_done: > .byte 0xf3 > ret > - > + > +#if defined (__ELF__) && defined (__linux__) > .section .rodata > +#endif > > .align 16 > p4_constants: > @@ -122,13 +125,13 @@ p4_constants: > > .text > .align 16 > -.globl _mesa_x86_64_transform_points4_3d > -.hidden _mesa_x86_64_transform_points4_3d > +GLOBL GLNAME(_mesa_x86_64_transform_points4_3d) > +HIDDEN(_mesa_x86_64_transform_points4_3d) > /* > * this is slower than _mesa_x86_64_transform_points4_general > * because it ensures that the last matrix row (or is it column?) is 0,0,0,1 > */ > -_mesa_x86_64_transform_points4_3d: > +GLNAME(_mesa_x86_64_transform_points4_3d): > > leaq p4_constants(%rip), %rax > > @@ -194,9 +197,9 @@ p4_3d_done: > > > .align 16 > -.globl _mesa_x86_64_transform_points4_identity > -.hidden _mesa_x86_64_transform_points4_identity > -_mesa_x86_64_transform_points4_identity: > +GLOBL GLNAME(_mesa_x86_64_transform_points4_identity) > +HIDDEN(_mesa_x86_64_transform_points4_identitiy) > +GLNAME(_mesa_x86_64_transform_points4_identity): > > movl V4F_COUNT(%rdx), %ecx /* count */ > movzbl V4F_STRIDE(%rdx), %eax /* stride */ > @@ -223,9 +226,9 @@ p4_identity_done: > > > .align 16 > -.globl _mesa_3dnow_transform_points4_3d_no_rot > -.hidden _mesa_3dnow_transform_points4_3d_no_rot > -_mesa_3dnow_transform_points4_3d_no_rot: > +GLOBL GLNAME(_mesa_3dnow_transform_points4_3d_no_rot) > +HIDDEN(_mesa_3dnow_transform_points4_3d_no_rot) > +GLNAME(_mesa_3dnow_transform_points4_3d_no_rot): > > movl V4F_COUNT(%rdx), %ecx /* count */ > movzbl V4F_STRIDE(%rdx), %eax /* stride */ > @@ -288,9 +291,9 @@ p4_3d_no_rot_done: > > > .align 16 > -.globl _mesa_3dnow_transform_points4_perspective > -.hidden _mesa_3dnow_transform_points4_perspective > -_mesa_3dnow_transform_points4_perspective: > +GLOBL GLNAME(_mesa_3dnow_transform_points4_perspective) > +HIDDEN(_mesa_3dnow_transform_points4_perspective) > +GLNAME(_mesa_3dnow_transform_points4_perspective): > > movl V4F_COUNT(%rdx), %ecx /* count */ > movzbl V4F_STRIDE(%rdx), %eax /* stride */ > @@ -355,9 +358,9 @@ p4_perspective_done: > ret > > .align 16 > -.globl _mesa_3dnow_transform_points4_2d_no_rot > -.hidden _mesa_3dnow_transform_points4_2d_no_rot > -_mesa_3dnow_transform_points4_2d_no_rot: > +GLOBL GLNAME(_mesa_3dnow_transform_points4_2d_no_rot) > +HIDDEN(_mesa_3dnow_transform_points4_2d_no_rot) > +GLNAME(_mesa_3dnow_transform_points4_2d_no_rot): > > movl V4F_COUNT(%rdx), %ecx /* count */ > movzbl V4F_STRIDE(%rdx), %eax /* stride */ > @@ -411,9 +414,9 @@ p4_2d_no_rot_done: > > > .align 16 > -.globl _mesa_3dnow_transform_points4_2d > -.hidden _mesa_3dnow_transform_points4_2d > -_mesa_3dnow_transform_points4_2d: > +GLOBL GLNAME(_mesa_3dnow_transform_points4_2d) > +HIDDEN(_mesa_3dnow_transform_points4_2d) > +GLNAME(_mesa_3dnow_transform_points4_2d): > > movl V4F_COUNT(%rdx), %ecx /* count */ > movzbl V4F_STRIDE(%rdx), %eax /* stride */ > diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h > index 67867bd..8ba7e50 100644 > --- a/src/mesa/x86/assyntax.h > +++ b/src/mesa/x86/assyntax.h > @@ -255,7 +255,7 @@ > #endif /* ACK_ASSEMBLER */ > > > -#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) || defined(__GNUC__) && !defined(__MINGW32__) > +#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) || defined(__GNUC__) && !defined(__MINGW32__) && !defined(__APPLE__) > #define GLNAME(a) a > #else > #define GLNAME(a) CONCAT(_,a) </div></div>Considering that this is a fragile area in mesa, can you confirm what kind of testing you've done ? Would be nice to avoid breaking things in various subtle ways. </blockquote><div> </div><div>Very minimal tests: only glxgears and es2gears_x11, on osx. </div><div>Also "make check" succeeds until it reaches glx-test which fails to build (link error). I need to submit a bug.</div> <div> </div><div>For the record here are the configure options:</div><div>--enable-debug --enable-asm --disable-vdpau --disable-va --disable-omx --enable-dri --with-gallium-drivers=swrast --enable-gles2 --enable-gles1 --enable-glx --enable-opengl --enable-gallium-osmesa --with-egl-platforms=x11 --enable-gallium-llvm --disable-llvm-shared-libs</div><div>Cheers</div><div>Julien</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"> Note to self: Upon a closer look, I'm not sure of many of the assemblers mentioned in assyntax.h are available/used nowadays. Maybe we can have a crazy^W brave soul that does some cleanup in here :-) -Emil </blockquote></div> </div></div>