summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-04-14 14:10:32 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-04-14 14:10:32 -0600
commit118c2bc860037f084166d3406039d82198ddf3d6 (patch)
tree3b1462996d40120170744fa3a09a3d3618b7344f
parent8fd2b7d9ddbc3c832d0452eb32709d8c835fb193 (diff)
only use __x86_64__, not __amd64__ (bug 15503)
-rw-r--r--src/mesa/drivers/dri/sis/sis_context.h2
-rw-r--r--src/mesa/main/imports.h2
-rw-r--r--src/mesa/math/m_debug_util.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_context.h b/src/mesa/drivers/dri/sis/sis_context.h
index 6289fb4500..5fc8267879 100644
--- a/src/mesa/drivers/dri/sis/sis_context.h
+++ b/src/mesa/drivers/dri/sis/sis_context.h
@@ -401,7 +401,7 @@ struct sis_context
#define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg))
#define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg))
-#if defined(__i386__) || defined(__amd64__)
+#if defined(__i386__) || defined(__x86_64__)
#define MMIO_WMB() __asm __volatile("" : : : "memory")
#elif defined(__ia64__)
#define MMIO_WMB() __asm __volatile("mf" : : : "memory")
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index b0234a2b85..7ee26b423c 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -159,7 +159,7 @@ typedef union { GLfloat f; GLint i; } fi_type;
***/
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
defined(__s390x__) || defined(__powerpc__) || \
- defined(__amd64__) || defined(__x86_64__) || \
+ defined(__x86_64__) || \
defined(ia64) || defined(__ia64__) || \
defined(__hppa__) || defined(hpux) || \
defined(__mips) || defined(_MIPS_ARCH) || \
diff --git a/src/mesa/math/m_debug_util.h b/src/mesa/math/m_debug_util.h
index f7ce4679b6..2d1d8b1880 100644
--- a/src/mesa/math/m_debug_util.h
+++ b/src/mesa/math/m_debug_util.h
@@ -185,7 +185,7 @@ extern char *mesa_profile;
#endif
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
#define rdtscll(val) do { \
unsigned int a,d; \