From 9719354ae04a41e9834ac9ba8fd9e895092ba4f1 Mon Sep 17 00:00:00 2001

From: Adam Jackson <[email protected]>

Date: Tue, 24 Jun 2008 14:37:06 -0400

Subject: [PATCH] Check for __amd64__, not __x86_64__.

Spiritual revert of 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe.  Intel's C

compiler claims to be gcc-compatible; if they're not defining the same

macros as gcc then that's their bug, not ours.  Even if we were to do

this aliasing we should do it once and for all in servermd.h.

---

 fb/fb.h                                 |    2 +-

 hw/xfree86/common/compiler.h            |    2 +-

 hw/xfree86/common/xf86AutoConfig.c      |    2 +-

 hw/xfree86/loader/loader.c              |    2 +-

 hw/xfree86/os-support/bsd/bsdResource.c |    2 +-

 hw/xfree86/os-support/bus/Pci.h         |    2 +-

 hw/xfree86/os-support/misc/SlowBcopy.c  |    4 ++--

 hw/xfree86/utils/xorgcfg/loadmod.c      |    2 +-

 hw/xfree86/x86emu/prim_ops.c            |    2 +-

 hw/xfree86/x86emu/x86emu/prim_x86_gcc.h |    2 +-

 hw/xfree86/x86emu/x86emu/types.h        |    2 +-

 include/servermd.h                      |    2 +-

 mi/micoord.h                            |    2 +-

 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/fb/fb.h b/fb/fb.h

index 8e76beb..2c6c4fb 100644

--- a/fb/fb.h

+++ b/fb/fb.h

@@ -138,7 +138,7 @@ #  if defined(__alpha__) || defined(__al

       defined(ia64) || defined(__ia64__) || \

       defined(__sparc64__) || defined(_LP64) || \

       defined(__s390x__) || \

-      defined(amd64) || defined (__amd64__) || defined(__x86_64__) || \

+      defined(amd64) || defined (__amd64__) \

       defined (__powerpc64__) || \

       (defined(sgi) && (_MIPS_SZLONG == 64))

 typedef unsigned long	    FbBits;

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h

index 9e7f821..a20baa3 100644

--- a/hw/xfree86/common/compiler.h

+++ b/hw/xfree86/common/compiler.h

@@ -498,7 +498,7 @@ extern unsigned int inb(unsigned long po

 extern unsigned int inw(unsigned long port);

 extern unsigned int inl(unsigned long port);

-#   elif defined(linux) && (defined(__amd64__) || defined(__x86_64__))

+#   elif defined(linux) && defined(__amd64__)

 #    include <inttypes.h>

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c

index 7e5fab4..a786eed 100644

--- a/hw/xfree86/common/xf86AutoConfig.c

+++ b/hw/xfree86/common/xf86AutoConfig.c

@@ -454,7 +454,7 @@ #endif /* __linux__ */

 	if (info != NULL)

 	    chosen_driver = videoPtrToDriverName(info);

 	if (chosen_driver == NULL) {

-#if defined  __i386__ || defined __amd64__ || defined __x86_64__ || defined __hurd__

+#if defined  __i386__ || defined __amd64__ || defined __hurd__

 	    chosen_driver = "vesa";

 #elif defined __sparc__

 	    chosen_driver = "sunffb";

diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c

index a00269b..774a4c4 100644

--- a/hw/xfree86/loader/loader.c

+++ b/hw/xfree86/loader/loader.c

@@ -63,7 +63,7 @@ #include <fcntl.h>

 #include <string.h>

 #if defined(linux) && \

     (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \

-    || defined(__amd64__) || defined(__x86_64__))

+    || defined(__amd64__))

 #include <malloc.h>

 #endif

 #include <stdarg.h>

diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c

index d1ee787..fe166c8 100644

--- a/hw/xfree86/os-support/bsd/bsdResource.c

+++ b/hw/xfree86/os-support/bsd/bsdResource.c

@@ -19,7 +19,7 @@ #include "bus/Pci.h"

 #ifdef INCLUDE_XF86_NO_DOMAIN

-#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__x86_64__)

+#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)

 resPtr

 xf86AccResFromOS(resPtr ret)

diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h

index 557483b..a1390c0 100644

--- a/hw/xfree86/os-support/bus/Pci.h

+++ b/hw/xfree86/os-support/bus/Pci.h

@@ -202,7 +202,7 @@ #if !defined(ARCH_PCI_INIT)

 /*

  * Select architecture specific PCI init function

  */

-#if defined(__i386__) || defined(__i386) ||  defined(__amd64__) || defined(__amd64) || defined(__x86_64__)

+#if defined(__i386__) || defined(__i386) ||  defined(__amd64__) || defined(__amd64)

 # define ARCH_PCI_INIT ix86PciInit

 #elif defined(__powerpc__) || defined(__powerpc64__)

 # define ARCH_PCI_INIT ppcPciInit

diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c

index 5cd7168..7c51fcc 100644

--- a/hw/xfree86/os-support/misc/SlowBcopy.c

+++ b/hw/xfree86/os-support/misc/SlowBcopy.c

@@ -30,7 +30,7 @@ xf86SetReallySlowBcopy(void)

 	really_slow_bcopy = 1;

 }

-#if defined(__i386__) || defined(__x86_64__)

+#if defined(__i386__) || defined(__amd64__)

 static void xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int len)

 {

     while(len--)

@@ -45,7 +45,7 @@ #endif

 _X_EXPORT void

 xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)

 {

-#if defined(__i386__) || defined(__x86_64__)

+#if defined(__i386__) || defined(__amd64__)

     if (really_slow_bcopy) {

 	xf86_really_slow_bcopy(src, dst, len);

 	return;

diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c

index 629dfe1..748bd3a 100644

--- a/hw/xfree86/utils/xorgcfg/loadmod.c

+++ b/hw/xfree86/utils/xorgcfg/loadmod.c

@@ -181,7 +181,7 @@ LOOKUP xfree86LookupTab[] = {

    SYMFUNC(xf86memcpy)

 #if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || \

     defined(__sparc__) || defined(__sparc) || defined(__ia64__) || \

-    defined (__amd64__) || defined(__x86_64__)

+    defined (__amd64__)

    /*

     * Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle

     * structure copies.  This causes a problem both here and in shared

diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c

index 41968e1..4a6ac5d 100644

--- a/hw/xfree86/x86emu/prim_ops.c

+++ b/hw/xfree86/x86emu/prim_ops.c

@@ -103,7 +103,7 @@ #define	PRIM_OPS_NO_REDEFINE_ASM

 #include "x86emu/x86emui.h"

 #if defined(__GNUC__)

-# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) || defined(__x86_64__)

+# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__amd64__)

 #  include "x86emu/prim_x86_gcc.h"

 # endif

 #endif

diff --git a/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h

index 5a443cd..5530a3a 100644

--- a/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h

+++ b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h

@@ -42,7 +42,7 @@ #define __X86EMU_PRIM_X86_GCC_H

 #include "x86emu/types.h"

-#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) || defined(__x86_64__))

+#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__amd64__))

 #error This file is intended to be used by gcc on i386 or x86-64 system

 #endif

diff --git a/hw/xfree86/x86emu/x86emu/types.h b/hw/xfree86/x86emu/x86emu/types.h

index 2d41b0f..ff28885 100644

--- a/hw/xfree86/x86emu/x86emu/types.h

+++ b/hw/xfree86/x86emu/x86emu/types.h

@@ -75,7 +75,7 @@ #if defined (_LP64) || \

     defined(__sparc64__) || \

     defined(__s390x__) || \

     (defined(__hppa__) && defined(__LP64)) || \

-    defined(__amd64__) || defined(amd64) || defined(__x86_64__) || \

+    defined(__amd64__) || defined(amd64) \

     (defined(__sgi) && (_MIPS_SZLONG == 64))

 #define NUM32 int

 #else

diff --git a/include/servermd.h b/include/servermd.h

index 91b705b..f10e6bc 100644

--- a/include/servermd.h

+++ b/include/servermd.h

@@ -285,7 +285,7 @@ # define GLYPHPADBYTES		4

 #endif /* ia64 */

-#if defined(__amd64__) || defined(amd64) || defined(__amd64) || defined(__x86_64__)

+#if defined(__amd64__) || defined(amd64) || defined(__amd64)

 # define IMAGE_BYTE_ORDER	LSBFirst

 # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)

diff --git a/mi/micoord.h b/mi/micoord.h

index 876e88c..16d0861 100644

--- a/mi/micoord.h

+++ b/mi/micoord.h

@@ -48,7 +48,7 @@ #if defined(mips) || defined(sgi) || \

     defined(__alpha) || defined(__alpha__) || \

     defined(__i386__) || defined(__i386) || defined(__ia64__) || \

     defined(__s390x__) || defined(__s390__) || \

-    defined(__amd64__) || defined(amd64) || defined(__amd64) || defined(__x86_64__)

+    defined(__amd64__) || defined(amd64) || defined(__amd64)

 #define GetHighWord(x) (((int) (x)) >> 16)

 #else

 #define GetHighWord(x) (((int) (x)) / 65536)

-- 

1.4.1