You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
84 lines
2.8 KiB
84 lines
2.8 KiB
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
|
|
#
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
# Please add additional copyright information _after_ the line containing
|
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
|
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
|
|
#
|
|
# ROCK Linux: rock-src/package/x11/xorg/gcc40.patch
|
|
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
|
|
#
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
# of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# --- ROCK-COPYRIGHT-NOTE-END ---
|
|
|
|
diff -dur xc/programs/Xserver/fb/fbmmx.c src.xorg.1129808283.2035.3041395841/xc/programs/Xserver/fb/fbmmx.c
|
|
--- xc/programs/Xserver/fb/fbmmx.c 2004-07-22 21:24:50.000000000 +0200
|
|
+++ src.xorg.1129808283.2035.3041395841/xc/programs/Xserver/fb/fbmmx.c 2005-10-20 21:26:33.000000000 +0200
|
|
@@ -33,11 +33,28 @@
|
|
#include "mipict.h"
|
|
#include "fbpict.h"
|
|
|
|
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 5)
|
|
+
|
|
+typedef int __attribute__((mode(QI))) qi;
|
|
+typedef int __attribute__((mode(HI))) hi;
|
|
+typedef int __attribute__((mode(SI))) si;
|
|
+typedef int __attribute__((mode(DI))) di;
|
|
+
|
|
+typedef di __attribute__((vector_size (8))) Vector1x64;
|
|
+typedef si __attribute__((vector_size (8))) Vector2x32;
|
|
+typedef hi __attribute__((vector_size (8))) Vector4x16;
|
|
+typedef qi __attribute__((vector_size (8))) Vector8x8;
|
|
+
|
|
+# else
|
|
+
|
|
typedef int Vector1x64 __attribute__ ((mode(DI)));
|
|
typedef int Vector2x32 __attribute__ ((mode(V2SI)));
|
|
typedef int Vector4x16 __attribute__ ((mode(V4HI)));
|
|
typedef int Vector8x8 __attribute__ ((mode(V8QI)));
|
|
|
|
+#endif
|
|
+
|
|
+
|
|
typedef unsigned long long ullong;
|
|
|
|
#define noVERBOSE
|
|
@@ -92,9 +109,21 @@
|
|
shift (Vector1x64 v, int s)
|
|
{
|
|
if (s > 0)
|
|
+
|
|
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 5)
|
|
+
|
|
+ return (Vector2x32) __builtin_ia32_psllq ((long long) v, (long long) s);
|
|
+ else if (s < 0)
|
|
+ return (Vector2x32) __builtin_ia32_psrlq ((long long) v, (long long) -s);
|
|
+
|
|
+#else
|
|
+
|
|
return __builtin_ia32_psllq (v, s);
|
|
else if (s < 0)
|
|
return __builtin_ia32_psrlq (v, -s);
|
|
+
|
|
+#endif
|
|
+
|
|
else
|
|
return v;
|
|
}
|
|
--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h~ 2004-08-03 11:38:03.000000000 +0200
|
|
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h 2005-11-17 12:22:21.000000000 +0100
|
|
@@ -146,7 +146,7 @@
|
|
extern Bool RADEONProbe
|
|
FunctionPrototype((DriverPtr, int));
|
|
|
|
-extern SymTabRec RADEONChipsets[];
|
|
+static SymTabRec RADEONChipsets[];
|
|
extern PciChipsets RADEONPciChipsets[];
|
|
|
|
/* radeon_driver.c */
|