xserver/fb fbmmx.c,1.13,1.14

[Billy Biggs]

Committed by: vektor

Update of /cvs/xserver/xserver/fb
In directory gabe:/tmp/cvs-serv6965/fb

Modified Files:
	fbmmx.c 
Log Message:
	* fb/fbmmx.c (detectCPUFeatures): Use local labels rather than
	global labels in the assembly, to be robust if the code is inlined
	in multiple places. (#4283, Reported by Marco Manfredini, patch by
	Owen Taylor)



Index: fbmmx.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbmmx.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fbmmx.c	28 Aug 2005 02:03:17 -0000	1.13
+++ fbmmx.c	29 Aug 2005 03:32:56 -0000	1.14
@@ -2504,7 +2504,7 @@
              "pop %%eax\n"
              "mov $0x0, %%edx\n"
              "xor %%ecx, %%eax\n"
-             "jz skip\n"
+             "jz 1f\n"
 
              "mov $0x00000000, %%eax\n"
 	     "push %%ebx\n"
@@ -2518,7 +2518,7 @@
 	     "push %%ebx\n"
              "cpuid\n"
 	     "pop %%ebx\n"
-             "skip:\n"
+             "1:\n"
              "mov %%edx, %0\n"
              : "=r" (result), 
                "=m" (vendor[0]), 
@@ -2548,10 +2548,10 @@
                     "cpuid\n"
                     "xor %%edx, %%edx\n"
                     "cmp $0x1, %%eax\n"
-                    "jge skip2\n"
+                    "jge 1f\n"
                     "mov $0x80000001, %%eax\n"
                     "cpuid\n"
-                    "skip2:\n"
+                    "1:\n"
                     "pop %%ebx\n"
                     "mov %%edx, %0\n"
                     : "=r" (result)