[cairo-commit] cairo/pixman/src fbmmx.c,1.4,1.5

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo/pixman/src
In directory gabe:/tmp/cvs-serv26743/src

Modified Files:
	fbmmx.c 
Log Message:
2005-08-28  Owen Taylor  <otaylor at redhat.com>

        * src/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)


Index: fbmmx.c
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/fbmmx.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fbmmx.c	28 Aug 2005 01:36:09 -0000	1.4
+++ fbmmx.c	28 Aug 2005 19:52:10 -0000	1.5
@@ -2505,7 +2505,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"
@@ -2519,7 +2519,7 @@
 	     "push %%ebx\n"
              "cpuid\n"
 	     "pop %%ebx\n"
-             "skip:\n"
+             "1:\n"
              "mov %%edx, %0\n"
              : "=r" (result), 
                "=m" (vendor[0]), 
@@ -2549,10 +2549,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)