projects / packages / X11.git / blame
| Commit | Line | Data |
|---|---|---|
| 830cb609 PS |
1 | |
| 2 | config/cf/xorg.cf | 2 +- | |
| 3 | programs/Xserver/fb/fbmmx.c | 13 +++++++------ | |
| 4 | programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h | 2 +- | |
| 5 | 3 files changed, 9 insertions(+), 8 deletions(-) | |
| 6 | ||
| 7 | --- X11-6.8.2/xc/config/cf/xorg.cf.orig 2005-03-21 19:11:42.000000000 +0100 | |
| 8 | +++ X11-6.8.2/xc/config/cf/xorg.cf 2005-03-21 23:03:46.000000000 +0100 | |
| 9 | @@ -1541,7 +1541,7 @@ | |
| 10 | # if defined(UseInstalled) | |
| 11 | # define DefaultCCOptions /* -ansi */ | |
| 12 | # else | |
| 13 | -# define DefaultCCOptions -ansi -pedantic GccWarningOptions | |
| 14 | +# define DefaultCCOptions -std=gnu9x -pedantic GccWarningOptions | |
| 15 | # endif | |
| 16 | # endif | |
| 17 | # if defined(UseInstalled) | |
| 7cdbeb1a PS |
18 | --- X11-6.8.2/xc/programs/Xserver/fb/fbmmx.c.orig 2004-07-22 21:24:50.000000000 +0200 |
| 19 | +++ X11-6.8.2/xc/programs/Xserver/fb/fbmmx.c 2005-02-15 10:32:50.573357352 +0100 | |
| 20 | @@ -23,6 +23,7 @@ | |
| 21 | * Based on work by Owen Taylor | |
| 22 | */ | |
| 23 | ||
| 24 | +#include <mmintrin.h> | |
| 25 | #include "fb.h" | |
| 26 | ||
| 27 | #ifdef USE_GCC34_MMX | |
| 28 | @@ -33,10 +34,10 @@ | |
| 29 | #include "mipict.h" | |
| 30 | #include "fbpict.h" | |
| 31 | ||
| 32 | -typedef int Vector1x64 __attribute__ ((mode(DI))); | |
| 33 | -typedef int Vector2x32 __attribute__ ((mode(V2SI))); | |
| 34 | -typedef int Vector4x16 __attribute__ ((mode(V4HI))); | |
| 35 | -typedef int Vector8x8 __attribute__ ((mode(V8QI))); | |
| 36 | +typedef __m64 Vector1x64; | |
| 37 | +typedef __v2si Vector2x32; | |
| 38 | +typedef __v4hi Vector4x16; | |
| 39 | +typedef __v8qi Vector8x8; | |
| 40 | ||
| 41 | typedef unsigned long long ullong; | |
| 42 | ||
| 43 | @@ -92,9 +93,9 @@ | |
| 44 | shift (Vector1x64 v, int s) | |
| 45 | { | |
| 46 | if (s > 0) | |
| 47 | - return __builtin_ia32_psllq (v, s); | |
| 48 | + return (Vector1x64)__builtin_ia32_psllq ((ullong)v, (ullong)s); | |
| 49 | else if (s < 0) | |
| 50 | - return __builtin_ia32_psrlq (v, -s); | |
| 51 | + return (Vector1x64)__builtin_ia32_psrlq ((ullong)v, (ullong)-s); | |
| 52 | else | |
| 53 | return v; | |
| 54 | } | |
| 55 | --- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h.orig 2004-08-12 04:23:46.000000000 +0200 | |
| 56 | +++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h 2005-02-15 11:00:00.350593552 +0100 | |
| 57 | @@ -1,4 +1,4 @@ | |
| 58 | -static SymTabRec RADEONChipsets[] = { | |
| 59 | +SymTabRec RADEONChipsets[] = { | |
| 60 | { PCI_CHIP_RADEON_QD, "ATI Radeon QD (AGP)" }, | |
| 61 | { PCI_CHIP_RADEON_QE, "ATI Radeon QE (AGP)" }, | |
| 62 | { PCI_CHIP_RADEON_QF, "ATI Radeon QF (AGP)" }, |