diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-11-19 06:54:34 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-11-19 06:54:34 +0000 |
| commit | 814f1045c1664925d64abd3e4c3f7d43ae0bd712 (patch) | |
| tree | 57fbd4fa3910cb749989a4c0b65b4edcaa901c13 /sys-apps/lshw | |
| parent | Stable on x86; bug #112687 (diff) | |
| download | gentoo-2-814f1045c1664925d64abd3e4c3f7d43ae0bd712.tar.gz gentoo-2-814f1045c1664925d64abd3e4c3f7d43ae0bd712.tar.bz2 gentoo-2-814f1045c1664925d64abd3e4c3f7d43ae0bd712.zip | |
fix patch so it actually compiles #112930 by Juergen Rose
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'sys-apps/lshw')
| -rw-r--r-- | sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch b/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch index 524b2095780f..b27b3a808d13 100644 --- a/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch +++ b/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch @@ -18,7 +18,7 @@ http://bugs.gentoo.org/61947 static void cpuid(int cpunumber, unsigned long idx, unsigned long &eax, -@@ -96,7 +93,18 @@ +@@ -96,7 +93,21 @@ edx = (*(unsigned long *) (buffer + 12)); } else @@ -29,12 +29,15 @@ http://bugs.gentoo.org/61947 + "cpuid\n" + "movl %%ebx,%3\n" + "movl %%edi,%%ebx\n" -+ : "=a" (eax), "=c" (ecx), "=d" (edx), "=m" (ebx), "edi" ++ : "=a" (eax), "=c" (ecx), "=d" (edx), "=m" (ebx) ++ : "a" (idx) ++ : "edi" +#else + "cpuid\n" + : "=a" (eax), "=c" (ecx), "=d" (edx), "=b" (ebx) ++ : "a" (idx) +#endif -+ : "a" (idx)); ++ ); } /* Decode Intel TLB and cache info descriptors */ |