andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check for __x86_64__ when we check for __amd64__

Browse Source 
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
(cherry picked from commit 1fa4de80fc)
This commit is contained in:
Matt Turner 2008-04-12 20:39:18 +02:00 committed by Dave Airlie
parent d2f4471933
commit db00d4a4dc
14 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fb/fb.h
View File

@ -141,7 +141,7 @@ typedef unsigned __int64 FbBits;
defined(ia64) || defined(__ia64__) || \ defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || defined(_LP64) || \ defined(__sparc64__) || defined(_LP64) || \
defined(__s390x__) || \ defined(__s390x__) || \
defined(amd64) || defined (__amd64__) || \ defined(amd64) || defined (__amd64__) || defined(__x86_64__) || \
defined (__powerpc64__) || \ defined (__powerpc64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64)) (defined(sgi) && (_MIPS_SZLONG == 64))
typedef unsigned long FbBits; typedef unsigned long FbBits;

2
hw/xfree86/common/compiler.h
View File

@ -498,7 +498,7 @@ extern unsigned int inb(unsigned long port);
extern unsigned int inw(unsigned long port); extern unsigned int inw(unsigned long port);
extern unsigned int inl(unsigned long port); extern unsigned int inl(unsigned long port);
# elif defined(linux) && defined(__amd64__) # elif defined(linux) && (defined(__amd64__) || defined(__x86_64__))
# include <inttypes.h> # include <inttypes.h>

2
hw/xfree86/common/xf86AutoConfig.c
View File

@ -449,7 +449,7 @@ chooseVideoDriver(void)
if (info != NULL) if (info != NULL)
chosen_driver = videoPtrToDriverName(info); chosen_driver = videoPtrToDriverName(info);
if (chosen_driver == NULL) { if (chosen_driver == NULL) {
#if defined __i386__ || defined __amd64__ || defined __hurd__ #if defined __i386__ || defined __amd64__ || defined __x86_64__ || defined __hurd__
chosen_driver = "vesa"; chosen_driver = "vesa";
#elif defined __sparc__ #elif defined __sparc__
chosen_driver = "sunffb"; chosen_driver = "sunffb";

2
hw/xfree86/loader/loader.c
View File

@ -63,7 +63,7 @@
#include <string.h> #include <string.h>
#if defined(linux) && \ #if defined(linux) && \
(defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \ (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
|| defined(__amd64__)) || defined(__amd64__) || defined(__x86_64__))
#include <malloc.h> #include <malloc.h>
#endif #endif
#include <stdarg.h> #include <stdarg.h>

2
hw/xfree86/os-support/bsd/bsdResource.c
View File

@ -19,7 +19,7 @@
#ifdef INCLUDE_XF86_NO_DOMAIN #ifdef INCLUDE_XF86_NO_DOMAIN
#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) #if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__x86_64__)
resPtr resPtr
xf86AccResFromOS(resPtr ret) xf86AccResFromOS(resPtr ret)

8
hw/xfree86/os-support/bsd/i386_video.c
View File

@ -55,7 +55,7 @@
#endif #endif
#endif #endif
#if defined(__OpenBSD__) && defined(__amd64__) #if defined(__OpenBSD__) && (defined(__amd64__) || defined(__x86_64__))
#include <machine/mtrr.h> #include <machine/mtrr.h>
#include <machine/sysarch.h> #include <machine/sysarch.h>
#endif #endif
@ -108,7 +108,7 @@ static pointer NetBSDsetWC(int, unsigned long, unsigned long, Bool,
MessageType); MessageType);
static void NetBSDundoWC(int, pointer); static void NetBSDundoWC(int, pointer);
#endif #endif
#if defined(__amd64__) && defined(__OpenBSD__) #if (defined(__amd64__) || defined(__x86_64__)) && defined(__OpenBSD__)
static pointer amd64setWC(int, unsigned long, unsigned long, Bool, static pointer amd64setWC(int, unsigned long, unsigned long, Bool,
MessageType); MessageType);
static void amd64undoWC(int, pointer); static void amd64undoWC(int, pointer);
@ -229,7 +229,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
pVidMem->setWC = NetBSDsetWC; pVidMem->setWC = NetBSDsetWC;
pVidMem->undoWC = NetBSDundoWC; pVidMem->undoWC = NetBSDundoWC;
#endif #endif
#if defined(__amd64__) && defined(__OpenBSD__) #if (defined(__amd64__) || defined(__x86_64__)) && defined(__OpenBSD__)
pVidMem->setWC = amd64setWC; pVidMem->setWC = amd64setWC;
pVidMem->undoWC = amd64undoWC; pVidMem->undoWC = amd64undoWC;
#endif #endif
@ -953,7 +953,7 @@ NetBSDundoWC(int screenNum, pointer list)
} }
#endif #endif
#if defined(__OpenBSD__) && defined(__amd64__) #if defined(__OpenBSD__) && (defined(__amd64__) || defined(__x86_64__))
static pointer static pointer
amd64setWC(int screenNum, unsigned long base, unsigned long size, Bool enable, amd64setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
MessageType from) MessageType from)

2
hw/xfree86/os-support/bus/Pci.h
View File

@ -246,7 +246,7 @@
# if !defined(__FreeBSD__) && !defined(linux) # if !defined(__FreeBSD__) && !defined(linux)
# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
# endif # endif
#elif defined(__amd64__) || defined(__amd64) #elif defined(__amd64__) || defined(__amd64) || defined(__x86_64__)
# if defined(linux) # if defined(linux)
# define ARCH_PCI_INIT linuxPciInit # define ARCH_PCI_INIT linuxPciInit
# else # else

4
hw/xfree86/utils/xorgcfg/loadmod.c
View File

@ -179,7 +179,9 @@ LOOKUP xfree86LookupTab[] = {
SYMFUNC(xf86memchr) SYMFUNC(xf86memchr)
SYMFUNC(xf86memcmp) SYMFUNC(xf86memcmp)
SYMFUNC(xf86memcpy) SYMFUNC(xf86memcpy)
#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined (__amd64__) #if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || \
defined(__sparc__) || defined(__sparc) || defined(__ia64__) || \
defined (__amd64__) || defined(__x86_64__)
/* /*
* Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle * Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle
* structure copies. This causes a problem both here and in shared * structure copies. This causes a problem both here and in shared

2
hw/xfree86/x86emu/prim_ops.c
View File

@ -103,7 +103,7 @@
#include "x86emu/x86emui.h" #include "x86emu/x86emui.h"
#if defined(__GNUC__) #if defined(__GNUC__)
# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) # if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) || defined(__x86_64__)
# include "x86emu/prim_x86_gcc.h" # include "x86emu/prim_x86_gcc.h"
# endif # endif
#endif #endif

2
hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
View File

@ -42,7 +42,7 @@
#include "x86emu/types.h" #include "x86emu/types.h"
#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__)) #if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) || defined(__x86_64__))
#error This file is intended to be used by gcc on i386 or x86-64 system #error This file is intended to be used by gcc on i386 or x86-64 system
#endif #endif

2
hw/xfree86/x86emu/x86emu/types.h
View File

@ -75,7 +75,7 @@
defined(__sparc64__) || \ defined(__sparc64__) || \
defined(__s390x__) || \ defined(__s390x__) || \
(defined(__hppa__) && defined(__LP64)) || \ (defined(__hppa__) && defined(__LP64)) || \
defined(__amd64__) || defined(amd64) || \ defined(__amd64__) || defined(amd64) || defined(__x86_64__) || \
(defined(__sgi) && (_MIPS_SZLONG == 64)) (defined(__sgi) && (_MIPS_SZLONG == 64))
#define NUM32 int #define NUM32 int
#else #else

2
hw/xprint/ps/psout.h
View File

@ -169,7 +169,7 @@ typedef signed __int64 PsOutColor;
defined(ia64) || defined(__ia64__) || \ defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || defined(_LP64) || \ defined(__sparc64__) || defined(_LP64) || \
defined(__s390x__) || \ defined(__s390x__) || \
defined(amd64) || defined (__amd64__) || \ defined(amd64) || defined (__amd64__) || defined(__x86_64__) || \
defined (__powerpc64__) || \ defined (__powerpc64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64)) (defined(sgi) && (_MIPS_SZLONG == 64))
typedef signed long PsOutColor; typedef signed long PsOutColor;

2
include/servermd.h
View File

@ -393,7 +393,7 @@ SOFTWARE.
#endif /* ia64 */ #endif /* ia64 */
#if defined(__amd64__) || defined(amd64) || defined(__amd64) #if defined(__amd64__) || defined(amd64) || defined(__amd64) || defined(__x86_64__)
# define IMAGE_BYTE_ORDER LSBFirst # define IMAGE_BYTE_ORDER LSBFirst
# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)

2
mi/micoord.h
View File

@ -48,7 +48,7 @@
defined(__alpha) || defined(__alpha__) || \ defined(__alpha) || defined(__alpha__) || \
defined(__i386__) || defined(__i386) || defined(__ia64__) || \ defined(__i386__) || defined(__i386) || defined(__ia64__) || \
defined(__s390x__) || defined(__s390__) || \ defined(__s390x__) || defined(__s390__) || \
defined(__amd64__) || defined(amd64) || defined(__amd64) defined(__amd64__) || defined(amd64) || defined(__amd64) || defined(__x86_64__)
#define GetHighWord(x) (((int) (x)) >> 16) #define GetHighWord(x) (((int) (x)) >> 16)
#else #else
#define GetHighWord(x) (((int) (x)) / 65536) #define GetHighWord(x) (((int) (x)) / 65536)