Author: dnusinow
Date: 2005-07-20 09:32:59 -0500 (Wed, 20 Jul 2005)
New Revision: 381
Modified:
trunk/debian/changelog
trunk/debian/patches/030_libvgahw_gcc4_volatile_fix.diff
Log:
- Update 030_libvgahw_gcc4_volatile_fix.diff to include a complete fix.
Closes: #318218
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-19 23:02:48 UTC (rev 380)
+++ trunk/debian/changelog 2005-07-20 14:32:59 UTC (rev 381)
@@ -13,6 +13,11 @@
arches. The failure diff will still be spit out, allowing us to fix the
problems.
+ Changes by Eugene Konev:
+
+ - Update 030_libvgahw_gcc4_volatile_fix.diff to include a complete fix.
+ Closes: #318218
+
-- David Nusinow <[EMAIL PROTECTED]> Mon, 18 Jul 2005 09:34:07 -0400
xorg-x11 (6.8.2.dfsg.1-3) unstable; urgency=low
Modified: trunk/debian/patches/030_libvgahw_gcc4_volatile_fix.diff
===================================================================
--- trunk/debian/patches/030_libvgahw_gcc4_volatile_fix.diff 2005-07-19
23:02:48 UTC (rev 380)
+++ trunk/debian/patches/030_libvgahw_gcc4_volatile_fix.diff 2005-07-20
14:32:59 UTC (rev 381)
@@ -5,7 +5,25 @@
diff -ruN xc-old/programs/Xserver/hw/xfree86/vgahw/vgaHW.c
xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c
--- xc-old/programs/Xserver/hw/xfree86/vgahw/vgaHW.c 2005-05-08
23:23:09.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c 2005-07-15
15:09:29.000000000 -0400
-@@ -441,12 +441,16 @@
+@@ -428,12 +428,16 @@
+ static void
+ mmioWriteAttr(vgaHWPtr hwp, CARD8 index, CARD8 value)
+ {
++ volatile CARD8 tmp;
++
+ if (hwp->paletteEnabled)
+ index &= ~0x20;
+ else
+ index |= 0x20;
+
+- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++ /* gcc-4.0 -O2 is broken : needs a volatile assignment */
++ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++
+ moutb(VGA_ATTR_INDEX, index);
+ moutb(VGA_ATTR_DATA_W, value);
+ }
+@@ -441,12 +445,16 @@
static CARD8
mmioReadAttr(vgaHWPtr hwp, CARD8 index)
{
@@ -17,9 +35,35 @@
index |= 0x20;
- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
-+ /* gcc-4.0 -O2 is broken : needs a volatile assignment */
-+ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++ /* gcc-4.0 -O2 is broken : needs a volatile assignment */
++ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
+
moutb(VGA_ATTR_INDEX, index);
return minb(VGA_ATTR_DATA_R);
}
+@@ -466,7 +474,11 @@
+ static void
+ mmioEnablePalette(vgaHWPtr hwp)
+ {
+- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++ volatile CARD8 tmp;
++
++ /* gcc-4.0 -O2 is broken : needs a volatile assignment */
++ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++
+ moutb(VGA_ATTR_INDEX, 0x00);
+ hwp->paletteEnabled = TRUE;
+ }
+@@ -474,7 +486,11 @@
+ static void
+ mmioDisablePalette(vgaHWPtr hwp)
+ {
+- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++ volatile CARD8 tmp;
++
++ /* gcc-4.0 -O2 is broken : needs a volatile assignment */
++ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++
+ moutb(VGA_ATTR_INDEX, 0x20);
+ hwp->paletteEnabled = FALSE;
+ }
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
