Attachment 15915 Details for Bug 15503 – replace __amd64__ and similar with __x86_64__

[patch] replace __amd64__ and similar with __x86_64__

only-use-__x86_64__-defines.patch (text/plain), 1.50 KB, created by Matt Turner on 2008-04-14 11:36:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Turner

Created: 2008-04-14 11:36:36 UTC

Size: 1.50 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/sis/sis_context.h b/src/mesa/drivers/dri/sis/sis_context.h
>index 6289fb4..5fc8267 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 b0234a2..7ee26b4 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 f7ce467..2d1d8b1 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; \

Actions: View | Splinter Review

Attachments on bug 15503: 15915

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.