rpms/xorg-x11/devel xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch, NONE, 1.1 xorg-x11.spec, 1.214, 1.215

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1412

Modified Files:
	xorg-x11.spec 
Added Files:
	xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch 
Log Message:
- Added xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch to attempt to work
  around bug (#161242, 162274, 153729, 159106, 160500, 161047, 160470,
  160453, 160307, 160777, 151688, 154502, 161566, 160950, 160580, 157556,
  161756, 160477, 155416, 160287, 162567, 157593, fdo#2991, fdo#2976,
  fdo#3557, gnu#22278)



xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch:
 vgaHW.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch ---
Patch submitted by Olivier Baudron in comment #56 of bug #161242 as
a temporary workaround for what appears to be a gcc4 bug, but is
currently being debated still.

Works around/fixes primary gcc bug:
	http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22278
	
Primary Red Hat libvgahw.a bug tracker:
	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=161242

Full list of all Red Hat and freedesktop bug dupes known at the time this
patch was added to the Fedora rpm packages:

  161242, 162274, 153729, 159106, 160500, 161047, 160470,
  160453, 160307, 160777, 151688, 154502, 161566, 160950, 160580, 157556,
  161756, 160477, 155416, 160287, 162567, 157593, fdo#2991, fdo#2976,
  fdo#3557, gnu#22278

There are likely numerous other duplicates in many different bugzillas.
	
--- xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c.libvgahw-workaround-rh161242	2005-07-12 12:44:35.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c	2005-07-12 12:47:41.000000000 -0400
@@ -441,12 +441,15 @@
 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);
 }


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- xorg-x11.spec	12 Jul 2005 11:23:04 -0000	1.214
+++ xorg-x11.spec	12 Jul 2005 17:04:17 -0000	1.215
@@ -523,6 +523,8 @@
 Patch9720: xorg-x11-6.8.2-gcc4-fix.patch
 Patch9721: xorg-x11-6.8.2-xnest-update-modifier-state-fdo3030-fdo3664.patch
 Patch9722: xorg-x11-6.8.2-xnest-fix-warning-spew-fdo3513.patch
+Patch9723: xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch
+
 
 # END OF 6.8.3 CANDIDATES
 # END OF DEVEL PATCHES
@@ -1187,6 +1189,7 @@
 %patch9720 -p0 -b .gcc4-fix
 %patch9721 -p0 -b .xnest-update-modifier-state-fdo3030-fdo3664
 %patch9722 -p0 -b .xnest-fix-warning-spew-fdo3513
+%patch9723 -p0 -b .libvgahw-workaround-rh161242
 %endif
 
 ########################################################################
@@ -3604,7 +3607,12 @@
 - Updated xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch to
   add a log file message about ScreenToScreenCopy being disabled on some
   GeForce models for bug (#157715)
-
+- Added xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch to attempt to work
+  around bug (#161242, 162274, 153729, 159106, 160500, 161047, 160470,
+  160453, 160307, 160777, 151688, 154502, 161566, 160950, 160580, 157556,
+  161756, 160477, 155416, 160287, 162567, 157593, fdo#2991, fdo#2976,
+  fdo#3557, gnu#22278)
+  
 * Fri Jul  8 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-42
 - Added xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch to
   work around "nv" driver bug, by disabling ScreenToScreenCopy on certain