2006-12-18 15:48:26 +01:00
|
|
|
diff -aur a/configure.ac b/configure.ac
|
|
|
|
|
--- a/configure.ac 2006-09-21 21:46:45.000000000 -0700
|
|
|
|
|
+++ b/configure.ac 2006-09-21 21:46:29.000000000 -0700
|
|
|
|
|
@@ -194,6 +194,7 @@
|
|
|
|
|
case $host_os in
|
|
|
|
|
*netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;
|
|
|
|
|
esac
|
|
|
|
|
+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
|
|
|
|
|
;;
|
|
|
|
|
arm*)
|
|
|
|
|
ARM_VIDEO=yes
|
|
|
|
|
@@ -220,6 +221,7 @@
|
|
|
|
|
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"
|
|
|
|
|
@@ -231,8 +233,16 @@
|
|
|
|
|
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])
|
|
|
|
|
diff -aur a/GL/glx/Makefile.am b/GL/glx/Makefile.am
|
|
|
|
|
--- a/GL/glx/Makefile.am 2006-07-05 11:31:36.000000000 -0700
|
|
|
|
|
+++ b/GL/glx/Makefile.am 2006-09-21 21:37:03.000000000 -0700
|
|
|
|
|
@@ -17,7 +17,8 @@
|
2007-10-03 01:21:25 +02:00
|
|
|
-I@MESA_SOURCE@/src/mesa/glapi \
|
|
|
|
|
-I@MESA_SOURCE@/src/mesa/main \
|
|
|
|
|
-DXFree86Server \
|
2006-12-18 15:48:26 +01:00
|
|
|
- @GLX_DEFINES@
|
|
|
|
|
+ @GLX_DEFINES@ \
|
|
|
|
|
+ @GLX_ARCH_DEFINES@
|
|
|
|
|
|
|
|
|
|
# none yet
|
|
|
|
|
#sdk_HEADERS =
|
|
|
|
|
--- xorg-server-1.1.99.3/hw/dmx/glxProxy/Makefile.am.orig 2006-10-09 21:05:37.000000000 +0200
|
|
|
|
|
+++ xorg-server-1.1.99.3/hw/dmx/glxProxy/Makefile.am 2006-10-09 21:06:25.000000000 +0200
|
|
|
|
|
@@ -40,4 +40,5 @@
|
|
|
|
|
-I@MESA_SOURCE@/include \
|
|
|
|
|
-DHAVE_DMX_CONFIG_H \
|
|
|
|
|
@DMXMODULES_CFLAGS@ \
|
|
|
|
|
+ @GLX_ARCH_DEFINES@ \
|
|
|
|
|
-I$(top_srcdir)/hw/xfree86/os-support
|
