Change another usage of __AMD64__ to the standard __amd64__, and remove

__AMD64__ from the linux configs so it won't creep back in as easily.  Fixes
hang on FreeBSD on the first lock grab.

diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index 616de54efb2f65a8f6d75f4fbd3d6f130d6fc4ce..bc115246305795f47b44cce089be35b3eaaf3e0c 100644 (file)
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -9,7 +9,7 @@ CONFIG_NAME = linux-dri-x86-64
 CC = gcc
 CXX = g++
 
-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE  -D__AMD64__ 
+DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE 
 
 CFLAGS = -m64 -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math $(DEFINES)
 CXXFLAGS = -m64 -Wall -g -ansi -pedantic -fPIC $(DEFINES)

diff --git a/configs/linux-x86-64 b/configs/linux-x86-64
index e3f58e6921b9bc92e9edcddde40e7a590fcd321d..9f03754962f02f81cf35cc4545650c8427f01683 100644 (file)
--- a/configs/linux-x86-64
+++ b/configs/linux-x86-64
@@ -8,9 +8,9 @@ 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 -DPTHREADS -D__AMD64__ -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 -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 -D__AMD64__
+CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 
 GLUT_CFLAGS = -fexceptions
 

diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static
index 500b818c86c54bdd12194101f7306672851ed6fa..5dd5da645f4bed8863fa6884558fc714403fe9aa 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 -DPTHREADS -D__AMD64__ -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 -I/usr/X11R6/include
 
-CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
+CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 
 GLUT_CFLAGS = -fexceptions
 

diff --git a/src/mesa/drivers/dri/dri_client/imports/xf86drm.h b/src/mesa/drivers/dri/dri_client/imports/xf86drm.h
index 0b6e93fd3ef46ae29f4be2bcba9e904e2c588b47..d3d78eb84e8b5ca0aa9912a1259c802f3c259325 100644 (file)
--- a/src/mesa/drivers/dri/dri_client/imports/xf86drm.h
+++ b/src/mesa/drivers/dri/dri_client/imports/xf86drm.h
@@ -285,7 +285,7 @@ typedef struct _drmSetVersion {
 #define DRM_LOCK_CONT  0x40000000 /**< Hardware lock is contended */
 
 #if defined(__GNUC__) && (__GNUC__ >= 2)
-# if defined(__i386) || defined(__AMD64__)
+# if defined(__i386) || defined(__amd64__)
                                /* Reflect changes here to drmP.h */
 #define DRM_CAS(lock,old,new,__ret)                                    \
        do {                                                           \