X Strike Force X.Org X11 SVN commit: r1326 - in branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian: . patches
Author: dnusinow
Date: 2006-02-26 18:20:19 -0500 (Sun, 26 Feb 2006)
New Revision: 1326
Added:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/02_libvgahw_gcc4_volatile_fix.diff
Modified:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series
Log:
* Port patches from trunk
+ 030_libvgahw_gcc4_volatile_fix.diff
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-02-26 23:03:36 UTC (rev 1325)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-02-26 23:20:19 UTC (rev 1326)
@@ -2,8 +2,10 @@
[ David Nusinow ]
* Add versioned dependency on x11-common
+ * Port patches from trunk
+ + 030_libvgahw_gcc4_volatile_fix.diff
- -- David Nusinow <dnusinow@debian.org> Fri, 24 Feb 2006 01:10:10 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 18:19:07 -0500
xorg-server (1:1.0.1-1) experimental; urgency=low
Added: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/02_libvgahw_gcc4_volatile_fix.diff
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/02_libvgahw_gcc4_volatile_fix.diff 2006-02-26 23:03:36 UTC (rev 1325)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/02_libvgahw_gcc4_volatile_fix.diff 2006-02-26 23:20:19 UTC (rev 1326)
@@ -0,0 +1,66 @@
+Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/vgahw/vgaHW.c
+===================================================================
+--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/vgahw/vgaHW.c 2006-01-04 23:08:15.000000000 -0500
++++ xorg-server-X11R7.0-1.0.1/hw/xfree86/vgahw/vgaHW.c 2006-02-26 18:18:48.000000000 -0500
+@@ -432,12 +432,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);
+ }
+@@ -445,12 +449,16 @@
+ static CARD8
+ mmioReadAttr(vgaHWPtr hwp, CARD8 index)
+ {
++ 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);
+ return minb(VGA_ATTR_DATA_R);
+ }
+@@ -470,7 +478,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;
+ }
+@@ -478,7 +490,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;
+ }
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series 2006-02-26 23:03:36 UTC (rev 1325)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series 2006-02-26 23:20:19 UTC (rev 1326)
@@ -1 +1,2 @@
001_ubuntu_add_extra_modelines_from_xorg.patch -p1
+02_libvgahw_gcc4_volatile_fix.diff
Reply to: