fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

glx: Fix glXGetProcAddress() of global glX symbols post-automake conversion.

Browse source 
When a GL LD_PRELOAD library like apitrace was used,
glXGetProcAddress() would return the preload's symbols instead of
libGL's symbol, leading to infinite recursion when the returned
function was called.  This didn't hit apitrace on most apps because
who calls glXGetProcAddress() on the global functions.

The -Bsymbolic, which was present in mklib before automake conversion,
causes the glxcmds.c:GLX_functions table to be resolved at link time,
so that LD_PRELOADs don't affect it any more.

Fixes crashes when running wine under apitrace.

Tested-by: Matt Turner <mattst88@gmail.com>
Tested-by: Marek Olšák <maraeo@gmail.com>
This commit is contained in:
Eric Anholt 2012-03-20 13:51:31 -07:00
parent 20836c8185
commit e07b1603e2
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/glx/Makefile.am
View file

@ -101,6 +101,7 @@ GL_LIBS = \
$(GL_LIB_DEPS)
GL_LDFLAGS = \
-Wl,-Bsymbolic \
-version-number 1:2
libGL_la_SOURCES = $(GL_FILES)