GL: Add GLX compile flags lost in modular X server changes
RISC chips that trap on unaligned loads and stores need to define __GLX_ALIGN64. This used to get added to the cflags in the old *.cf files but it no longer does in the modular X server. Also, Alpha needs to pass -mieee to the compiler as well. This is a simple backport of a patch that debian, and probably other distributions, have been applying forever. To the best of my knowledge the patch was written by Jurij Smakov. See Debian bug number #388125. I just checked and this has been rotting for more than a year in freedesktop bugzilla as #8392. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
bae459cfc4
commit
36ff05771b
|
@ -14,7 +14,8 @@ AM_CFLAGS = \
|
|||
-I@MESA_SOURCE@/src/mesa/glapi \
|
||||
-I@MESA_SOURCE@/src/mesa/main \
|
||||
-DXFree86Server \
|
||||
@GLX_DEFINES@
|
||||
@GLX_DEFINES@ \
|
||||
@GLX_ARCH_DEFINES@
|
||||
|
||||
# none yet
|
||||
#sdk_HEADERS =
|
||||
|
|
10
configure.ac
10
configure.ac
|
@ -304,6 +304,7 @@ case $host_cpu in
|
|||
*freebsd*) SYS_LIBS=-lio ;;
|
||||
*netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;
|
||||
esac
|
||||
GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
|
||||
;;
|
||||
arm*)
|
||||
ARM_VIDEO=yes
|
||||
|
@ -333,6 +334,7 @@ case $host_cpu in
|
|||
xorg_loader_sparcmuldiv="yes"
|
||||
SPARC64_VIDEO=yes
|
||||
BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
|
||||
GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
|
||||
;;
|
||||
x86_64*|amd64*)
|
||||
use_x86_asm="yes"
|
||||
|
@ -347,8 +349,16 @@ case $host_cpu in
|
|||
SYS_LIBS=-lamd64
|
||||
;;
|
||||
esac
|
||||
GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
|
||||
;;
|
||||
ia64*)
|
||||
GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
|
||||
;;
|
||||
s390*)
|
||||
GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(GLX_ARCH_DEFINES)
|
||||
|
||||
dnl BSD *_video.c selection
|
||||
AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
|
||||
|
|
|
@ -32,6 +32,7 @@ libglxproxy_a_SOURCES = compsize.c \
|
|||
unpack.h
|
||||
|
||||
AM_CFLAGS = \
|
||||
@GLX_ARCH_DEFINES@ \
|
||||
$(DIX_CFLAGS) \
|
||||
-I$(top_srcdir)/hw/dmx \
|
||||
-I$(top_srcdir)/include \
|
||||
|
|
Loading…
Reference in New Issue