projects / packages / X11.git / blame
| Commit | Line | Data |
|---|---|---|
| 830cb609 | 1 | |
| b2bb7e95 PS |
2 | config/cf/xorg.cf | 2 +- |
| 3 | programs/Xserver/fb/fbmmx.c | 14 ++++++++------ | |
| ffe0ed43 | 4 | programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c | 2 +- |
| b2bb7e95 | 5 | programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h | 3 --- |
| ffe0ed43 | 6 | 4 files changed, 10 insertions(+), 11 deletions(-) |
| 830cb609 PS |
7 | |
| 8 | --- X11-6.8.2/xc/config/cf/xorg.cf.orig 2005-03-21 19:11:42.000000000 +0100 | |
| 9 | +++ X11-6.8.2/xc/config/cf/xorg.cf 2005-03-21 23:03:46.000000000 +0100 | |
| 10 | @@ -1541,7 +1541,7 @@ | |
| 11 | # if defined(UseInstalled) | |
| 12 | # define DefaultCCOptions /* -ansi */ | |
| 13 | # else | |
| 14 | -# define DefaultCCOptions -ansi -pedantic GccWarningOptions | |
| 15 | +# define DefaultCCOptions -std=gnu9x -pedantic GccWarningOptions | |
| 16 | # endif | |
| 17 | # endif | |
| 18 | # if defined(UseInstalled) | |
| 7cdbeb1a PS |
19 | --- X11-6.8.2/xc/programs/Xserver/fb/fbmmx.c.orig 2004-07-22 21:24:50.000000000 +0200 |
| 20 | +++ X11-6.8.2/xc/programs/Xserver/fb/fbmmx.c 2005-02-15 10:32:50.573357352 +0100 | |
| b27f13f0 | 21 | @@ -27,6 +27,8 @@ |
| 22 | ||
| 23 | #ifdef USE_GCC34_MMX | |
| 7cdbeb1a PS |
24 | |
| 25 | +#include <mmintrin.h> | |
| b27f13f0 | 26 | + |
| 27 | #ifdef RENDER | |
| 7cdbeb1a | 28 | |
| b27f13f0 | 29 | #include "picturestr.h" |
| 7cdbeb1a PS |
30 | @@ -33,10 +34,10 @@ |
| 31 | #include "mipict.h" | |
| 32 | #include "fbpict.h" | |
| 33 | ||
| 34 | -typedef int Vector1x64 __attribute__ ((mode(DI))); | |
| 35 | -typedef int Vector2x32 __attribute__ ((mode(V2SI))); | |
| 36 | -typedef int Vector4x16 __attribute__ ((mode(V4HI))); | |
| 37 | -typedef int Vector8x8 __attribute__ ((mode(V8QI))); | |
| 38 | +typedef __m64 Vector1x64; | |
| 39 | +typedef __v2si Vector2x32; | |
| 40 | +typedef __v4hi Vector4x16; | |
| 41 | +typedef __v8qi Vector8x8; | |
| 42 | ||
| 43 | typedef unsigned long long ullong; | |
| 44 | ||
| 45 | @@ -92,9 +93,9 @@ | |
| 46 | shift (Vector1x64 v, int s) | |
| 47 | { | |
| 48 | if (s > 0) | |
| 49 | - return __builtin_ia32_psllq (v, s); | |
| 50 | + return (Vector1x64)__builtin_ia32_psllq ((ullong)v, (ullong)s); | |
| 51 | else if (s < 0) | |
| 52 | - return __builtin_ia32_psrlq (v, -s); | |
| 53 | + return (Vector1x64)__builtin_ia32_psrlq ((ullong)v, (ullong)-s); | |
| 54 | else | |
| 55 | return v; | |
| 56 | } | |
| b2bb7e95 PS |
57 | --- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h.orig 2004-08-03 11:38:03.000000000 +0200 |
| 58 | +++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h 2005-03-31 14:20:45.000000000 +0200 | |
| 59 | @@ -146,9 +146,6 @@ | |
| 60 | extern Bool RADEONProbe | |
| 61 | FunctionPrototype((DriverPtr, int)); | |
| 62 | ||
| 63 | -extern SymTabRec RADEONChipsets[]; | |
| 64 | -extern PciChipsets RADEONPciChipsets[]; | |
| 65 | - | |
| 66 | /* radeon_driver.c */ | |
| 67 | extern void RADEONLoaderRefSymLists | |
| 68 | FunctionPrototype((void)); | |
| ffe0ed43 PS |
69 | --- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c.orig 2004-08-12 03:03:06.000000000 +0200 |
| 70 | +++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c 2005-03-31 14:20:34.000000000 +0200 | |
| 71 | @@ -51,7 +51,7 @@ | |
| 72 | ||
| 73 | #include "radeon_chipset.h" | |
| 74 | ||
| 75 | -PciChipsets RADEONPciChipsets[] = { | |
| 76 | +static PciChipsets RADEONPciChipsets[] = { | |
| 77 | { PCI_CHIP_RADEON_QD, PCI_CHIP_RADEON_QD, RES_SHARED_VGA }, | |
| 78 | { PCI_CHIP_RADEON_QE, PCI_CHIP_RADEON_QE, RES_SHARED_VGA }, | |
| 79 | { PCI_CHIP_RADEON_QF, PCI_CHIP_RADEON_QF, RES_SHARED_VGA }, |