diff options
| -rw-r--r-- | configs/linux-dri-x86-64 | 2 | ||||
| -rw-r--r-- | configs/linux-x86-64 | 4 | ||||
| -rw-r--r-- | configs/linux-x86-64-static | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/dri_client/imports/xf86drm.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 index 616de54efb..bc11524630 100644 --- 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 e3f58e6921..9f03754962 100644 --- 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 500b818c86..5dd5da645f 100644 --- 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 0b6e93fd3e..d3d78eb84e 100644 --- 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 { \ |