X11-gcc4.patch

   1
   2  config/cf/xorg.cf                                      |    2 +-
   3  programs/Xserver/fb/fbmmx.c                            |   14 ++++++++------
   4  programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h |    3 ---
   5  3 files changed, 9 insertions(+), 10 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)
  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 @@ -27,6 +27,8 @@
  21
  22  #ifdef USE_GCC34_MMX
  23
  24 +#include <mmintrin.h>
  25 +
  26  #ifdef RENDER
  27
  28  #include "picturestr.h"
  29 @@ -33,10 +34,10 @@
  30  #include "mipict.h"
  31  #include "fbpict.h"
  32
  33 -typedef int Vector1x64 __attribute__ ((mode(DI)));
  34 -typedef int Vector2x32 __attribute__ ((mode(V2SI)));
  35 -typedef int Vector4x16 __attribute__ ((mode(V4HI)));
  36 -typedef int Vector8x8  __attribute__ ((mode(V8QI)));
  37 +typedef __m64 Vector1x64;
  38 +typedef __v2si Vector2x32;
  39 +typedef __v4hi Vector4x16;
  40 +typedef __v8qi Vector8x8;
  41
  42  typedef unsigned long long ullong;
  43
  44 @@ -92,9 +93,9 @@
  45  shift (Vector1x64 v, int s)
  46  {
  47      if (s > 0)
  48 -       return __builtin_ia32_psllq (v, s);
  49 +       return (Vector1x64)__builtin_ia32_psllq ((ullong)v, (ullong)s);
  50      else if (s < 0)
  51 -       return __builtin_ia32_psrlq (v, -s);
  52 +       return (Vector1x64)__builtin_ia32_psrlq ((ullong)v, (ullong)-s);
  53      else
  54         return v;
  55  }
  56 --- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h.orig    2004-08-03 11:38:03.000000000 +0200
  57 +++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h 2005-03-31 14:20:45.000000000 +0200
  58 @@ -146,9 +146,6 @@
  59  extern Bool                 RADEONProbe
  60                             FunctionPrototype((DriverPtr, int));
  61
  62 -extern SymTabRec            RADEONChipsets[];
  63 -extern PciChipsets          RADEONPciChipsets[];
  64 -
  65  /* radeon_driver.c */
  66  extern void                 RADEONLoaderRefSymLists
  67                             FunctionPrototype((void));