Commit 629c3792 authored by Egbert Eich's avatar Egbert Eich

36. Conversion: __AMD64__ > __amd64__ (Egbert Eich).

35. Fixed stretching option and centering in C&T driver (Egbert Eich).
34. Added support for memory size tweaking in BIOS for i845 (Egbert Eich,
    thanks to Christian Ziez)
33. Removed video playback dependency on Accel in NSC drivers (Egbert
3Eich).
32. Fix HW cursor state on Savage driver when entering VT as some BIOSes
    seem to enable it unconditionally (Egbert Eich).
31. Fixed Emulate3Button message to distinguish between 'hard' (ie.
    configured) and 'soft' (ie. automatic emulation that is disabled as
    soon as the middle button is pressed) (Egbert Eich).
30. Free XrmDB in XCloseDisplay() only when implicitely allocated by
    XGetDefaults(). If Client allocates it itself it should free it also.
    Trying to free it for the client may result in segfault if the client
    has already freed it (Egbert Eich).
parent b5e40086
......@@ -105,7 +105,7 @@ typedef unsigned __int64 FbBits;
defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || \
defined(__s390x__) || \
defined(AMD64) || defined (__AMD64__) || \
defined(amd64) || defined (__amd64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64))
typedef unsigned long FbBits;
# else
......
......@@ -497,7 +497,7 @@ __ustw (unsigned long r5, unsigned short * r11)
# define outw(a,b) _outw(b,a)
# define outl(a,b) _outl(b,a)
# elif defined(linux) && defined(__AMD64__)
# elif defined(linux) && defined(__amd64__)
# include <inttypes.h>
......
......@@ -138,7 +138,7 @@
# if !defined(linux)
# error No MAP_ANON?
# endif
# if !defined (__AMD64__) || !defined(__linux__)
# if !defined (__amd64__) || !defined(__linux__)
# define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON)
# else
# define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_32BIT)
......@@ -156,7 +156,7 @@
#if defined (__alpha__) || \
defined (__ia64__) || \
defined (__AMD64__) || \
defined (__amd64__) || \
(defined (__sparc__) && \
(defined (__arch64__) || \
defined (__sparcv9)))
......@@ -248,7 +248,7 @@ typedef Elf32_Word Elf_Word;
defined(__alpha__) || \
defined(__sparc__) || \
defined(__ia64__) || \
defined(__AMD64__)
defined(__amd64__)
typedef Elf_Rela Elf_Rel_t;
#else
typedef Elf_Rel Elf_Rel_t;
......@@ -442,7 +442,7 @@ ElfDelayRelocation(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel)
defined(__alpha__) || \
defined(__sparc__) || \
defined(__ia64__) || \
defined(__AMD64__)
defined(__amd64__)
ELFDEBUG(", r_addend 0x%lx", rel->r_addend);
# endif
ELFDEBUG("\n");
......@@ -477,7 +477,7 @@ ElfCOMMONSize(void)
size += common->sym->st_size;
#if defined(__alpha__) || \
defined(__ia64__) || \
defined(__AMD64__) || \
defined(__amd64__) || \
(defined(__sparc__) && \
(defined(__arch64__) || \
defined(__sparcv9)))
......@@ -501,7 +501,7 @@ ElfCreateCOMMON(ELFModulePtr elffile, LOOKUP *pLookup)
size += common->sym->st_size;
#if defined(__alpha__) || \
defined(__ia64__) || \
defined(__AMD64__) || \
defined(__amd64__) || \
(defined(__sparc__) && \
(defined(__arch64__) || \
defined(__sparcv9)))
......@@ -556,7 +556,7 @@ ElfCreateCOMMON(ELFModulePtr elffile, LOOKUP *pLookup)
offset += common->sym->st_size;
#if defined(__alpha__) || \
defined(__ia64__) || \
defined(__AMD64__) || \
defined(__amd64__) || \
(defined(__sparc__) && \
(defined(__arch64__) || \
defined(__sparcv9)))
......@@ -1217,7 +1217,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
unsigned long *dest64;
unsigned short *dest16;
#endif
#if defined(__AMD64__)
#if defined(__amd64__)
unsigned long *dest64;
int *dest32s;
#endif
......@@ -1235,7 +1235,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
defined(__alpha__) || \
defined(__sparc__) || \
defined(__ia64__) || \
defined(__AMD64__)
defined(__amd64__)
ELFDEBUG("%lx", rel->r_addend);
# endif
ELFDEBUG("\n");
......@@ -1294,7 +1294,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
break;
#endif /* i386 */
#if defined(__AMD64__)
#if defined(__amd64__)
case R_X86_64_32:
dest32 = (unsigned int *)(secp + rel->r_offset);
# ifdef ELFDEBUG
......@@ -1351,7 +1351,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
ELFDEBUG("*dest64=%8.8lx\n", *dest64);
# endif
break;
#endif /* __AMD64__ */
#endif /* __amd64__ */
#if defined(__alpha__)
case R_ALPHA_NONE:
case R_ALPHA_LITUSE:
......
......@@ -61,7 +61,7 @@
#include <string.h>
#if defined(linux) && \
(defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
|| defined(__AMD64__))
|| defined(__amd64__))
#include <malloc.h>
#endif
#include <stdarg.h>
......@@ -368,7 +368,7 @@ LoaderInit(void)
#if defined(linux) && \
(defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
|| ( defined __AMD64__ && ! defined UseMMAP && ! defined DoMMAPedMerge))
|| ( defined __amd64__ && ! defined UseMMAP && ! defined DoMMAPedMerge))
/*
* The glibc malloc uses mmap for large allocations anyway. This breaks
* some relocation types because the offset overflow. See loader.h for more
......@@ -487,7 +487,7 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label)
if ((new_off_bias + size) > new_size)
new_size += pagesize;
ret = (unsigned long)mmap(0, new_size, MMAP_PROT, MAP_PRIVATE
# ifdef __AMD64__
# ifdef __amd64__
| MAP_32BIT
# endif
, fd, new_off);
......@@ -496,7 +496,7 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label)
return (void *)(ret + new_off_bias);
# else
ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE
# ifdef __AMD64__
# ifdef __amd64__
| MAP_32BIT
# endif
, fd, offset + offsetbias);
......
......@@ -327,7 +327,7 @@
# if !defined(__FreeBSD__)
# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
# endif
#elif defined(__AMD64__)
#elif defined(__amd64__)
# if defined(__FreeBSD__)
# define ARCH_PCI_INIT freebsdPciInit
# else
......
......@@ -496,7 +496,7 @@ xf86mmap(void *start, xf86size_t length, int prot,
if (flags & XF86_MAP_FIXED) f |= MAP_FIXED;
if (flags & XF86_MAP_SHARED) f |= MAP_SHARED;
if (flags & XF86_MAP_PRIVATE) f |= MAP_PRIVATE;
#if defined(__AMD64__) && defined(linux)
#if defined(__amd64__) && defined(linux)
if (flags & XF86_MAP_32BIT) f |= MAP_32BIT;
#endif
if (prot & XF86_PROT_EXEC) p |= PROT_EXEC;
......
......@@ -182,7 +182,7 @@ LOOKUP xfree86LookupTab[] = {
SYMFUNC(xf86memchr)
SYMFUNC(xf86memcmp)
SYMFUNC(xf86memcpy)
#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__)
#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || 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
......
......@@ -76,7 +76,7 @@
defined(__sparc64__) || \
defined(__s390x__) || \
(defined(__hppa__) && defined(__LP64)) || \
defined(__AMD64__) || defined(AMD64) || \
defined(__amd64__) || defined(amd64) || \
(defined(__sgi) && (_MIPS_SZLONG == 64))
#define NUM32 int
#else
......
......@@ -389,7 +389,7 @@ SOFTWARE.
#endif /* ia64 */
#if defined(__AMD64__) || defined(AMD64)
#if defined(__amd64__) || defined(amd64)
# define IMAGE_BYTE_ORDER LSBFirst
# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
......
......@@ -50,7 +50,7 @@
defined(__i386__) || defined(i386) || \
defined(__ia64__) || defined(ia64) || \
defined(__s390x__) || defined(__s390__) || \
defined(__AMD64__) || defined(AMD64)
defined(__amd64__) || defined(amd64)
#define GetHighWord(x) (((int) (x)) >> 16)
#else
#define GetHighWord(x) (((int) (x)) / 65536)
......
......@@ -184,7 +184,7 @@ extern Bool Must_have_memory;
defined(__ia64__) || defined(ia64) || \
defined(__sparc64__) || \
defined(__s390x__) || \
defined(__AMD64__) || defined(AMD64) || \
defined(__amd64__) || defined(amd64) || \
(defined(sgi) && _MIPS_SZLONG == 64))
#define MAGIC 0x1404196414071968
#define MAGIC_FREE 0x1506196615061966
......
......@@ -170,7 +170,7 @@ typedef __int64 xFixed_32_32;
defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || \
defined(__s390x__) || \
defined(AMD64) || defined (__AMD64__) || \
defined(amd64) || defined (__amd64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64))
typedef long xFixed_32_32;
# else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment