AMD64 changes from Ronny V. Vindenes.

diff --git a/Makefile b/Makefile
index 0a82aa88cf6a3063c84cc33ba3cdd7839ff35d2b..52c0df94692a95b7d56d9d42297348de971b5408 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,7 @@ linux-alpha \
 linux-alpha-static \
 linux-debug \
 linux-dri \
+linux-dri-x86-64 \
 linux-glide \
 linux-icc \
 linux-icc-static \

diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
new file mode 100644 (file)
index 0000000..a829a14
--- /dev/null
+++ b/configs/linux-dri-x86-64
@@ -0,0 +1,34 @@
+# -*-makefile-*-
+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-dri-x86-64
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+CFLAGS = -m64 -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE -DGLX_DIRECT_RENDERING -D__AMD64__ -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+
+CXXFLAGS = -m64 -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
+
+#ASM_SOURCES = $(X86_SOURCES)
+
+LIB_DIR = $(TOP)/lib64
+
+# Library/program dependencies
+GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread -lexpat -ldl
+GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib64 -lXt -lXm -lX11
+
+# Directories
+SRC_DIRS = mesa glu glut/glx glw
+DRIVER_DIRS = dri
+PROGRAM_DIRS = 
+WINDOW_SYSTEM=dri
+
+# ffb & savage missing:
+#
+DRI_DIRS = dri_client gamma i810 i830 mach64 mga r128 r200 radeon sis tdfx unichrome
+

diff --git a/configs/linux-x86-64 b/configs/linux-x86-64
index 96d1d7fd192813201fb4a02b8a9133f5264de1f9..7f27ed80b4cd2ed436a44f17602c084f0bf90a0b 100644 (file)
--- a/configs/linux-x86-64
+++ b/configs/linux-x86-64
@@ -8,14 +8,14 @@ CONFIG_NAME = linux-x86-64
 CC = gcc
 CXX = g++
 
-CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
+CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -D__AMD64__ -I/usr/X11R6/include
 
-CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
 
 GLUT_CFLAGS = -fexceptions
 
 
-ASM_SOURCES = $(X86_SOURCES)
+#ASM_SOURCES = $(X86_SOURCES)
 
 
 LIB_DIR = $(TOP)/lib64

diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static
index 9fc0131f598324fe8cfc67dc2dab32e65b177c73..91104623064178ad9de3373a493e73a894c69038 100644 (file)
--- a/configs/linux-x86-64-static
+++ b/configs/linux-x86-64-static
@@ -8,9 +8,9 @@ CONFIG_NAME = linux-x86-64-static
 CC = gcc
 CXX = g++
 
-CFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
+CFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -D__AMD64__ -I/usr/X11R6/include
 
-CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
 
 GLUT_CFLAGS = -fexceptions
 
@@ -25,7 +25,7 @@ GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 
 
-ASM_SOURCES = $(X86_SOURCES)
+#ASM_SOURCES = $(X86_SOURCES)
 
 
 LIB_DIR = $(TOP)/lib64

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index d4df749f50b6232b0f58653042f097665fac7fa3..40d1809d3d646637ac205185a0b03f94d10ff05b 100644 (file)
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -224,7 +224,7 @@ extern void _ext_mesa_free_pixelbuffer( void *pb );
  ***/
 #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
     defined(__s390x__) || defined(__powerpc__) || \
-    defined(__AMD64__) || defined(__amd64__) || \
+    defined(__AMD64__) || \
     defined(ia64) || defined(__ia64__) || \
     (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
 #define USE_IEEE