Author: rmh
Date: 2006-03-02 18:23:01 +0000 (Thu, 02 Mar 2006)
New Revision: 1294
Modified:
trunk/kfreebsd-6/debian/patches/005_binutils.diff
Log:
Remove wrong hunks as pointed by Petr.
Modified: trunk/kfreebsd-6/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/005_binutils.diff 2006-03-02 13:17:04 UTC
(rev 1293)
+++ trunk/kfreebsd-6/debian/patches/005_binutils.diff 2006-03-02 18:23:01 UTC
(rev 1294)
@@ -170,86 +170,6 @@
sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi;
sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi;
sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
---- sys/amd64/include/pcpu.h~ 2006-03-01 23:10:56.000000000 +0100
-+++ sys/amd64/include/pcpu.h 2006-03-01 23:40:19.000000000 +0100
-@@ -80,7 +80,7 @@
- #define __PCPU_PTR(name) __extension__ ({
\
- __pcpu_type(name) *__p; \
- \
-- __asm __volatile("movq %%gs:%1,%0; addq %2,%0" \
-+ __asm __volatile("mov %%gs:%1,%0; addq %2,%0" \
- : "=r" (__p) \
- : "m" (*(struct pcpu *)(__pcpu_offset(pc_prvspace))), \
- "i" (__pcpu_offset(name))); \
-@@ -96,25 +96,25 @@
- \
- if (sizeof(__result) == 1) { \
- u_char __b; \
-- __asm __volatile("movb %%gs:%1,%0" \
-+ __asm __volatile("mov %%gs:%1,%0" \
- : "=r" (__b) \
- : "m" (*(u_char *)(__pcpu_offset(name)))); \
- __result = *(__pcpu_type(name) *)&__b; \
- } else if (sizeof(__result) == 2) { \
- u_short __w; \
-- __asm __volatile("movw %%gs:%1,%0" \
-+ __asm __volatile("mov %%gs:%1,%0" \
- : "=r" (__w) \
- : "m" (*(u_short *)(__pcpu_offset(name)))); \
- __result = *(__pcpu_type(name) *)&__w; \
- } else if (sizeof(__result) == 4) { \
- u_int __i; \
-- __asm __volatile("movl %%gs:%1,%0" \
-+ __asm __volatile("mov %%gs:%1,%0" \
- : "=r" (__i) \
- : "m" (*(u_int *)(__pcpu_offset(name)))); \
- __result = *(__pcpu_type(name) *)&__i; \
- } else if (sizeof(__result) == 8) { \
- u_long __l; \
-- __asm __volatile("movq %%gs:%1,%0" \
-+ __asm __volatile("mov %%gs:%1,%0" \
- : "=r" (__l) \
- : "m" (*(u_long *)(__pcpu_offset(name)))); \
- __result = *(__pcpu_type(name) *)&__l; \
-@@ -134,25 +134,25 @@
- if (sizeof(__val) == 1) { \
- u_char __b; \
- __b = *(u_char *)&__val; \
-- __asm __volatile("movb %1,%%gs:%0" \
-+ __asm __volatile("mov %1,%%gs:%0" \
- : "=m" (*(u_char *)(__pcpu_offset(name))) \
- : "r" (__b)); \
- } else if (sizeof(__val) == 2) { \
- u_short __w; \
- __w = *(u_short *)&__val; \
-- __asm __volatile("movw %1,%%gs:%0" \
-+ __asm __volatile("mov %1,%%gs:%0" \
- : "=m" (*(u_short *)(__pcpu_offset(name))) \
- : "r" (__w)); \
- } else if (sizeof(__val) == 4) { \
- u_int __i; \
- __i = *(u_int *)&__val; \
-- __asm __volatile("movl %1,%%gs:%0" \
-+ __asm __volatile("mov %1,%%gs:%0" \
- : "=m" (*(u_int *)(__pcpu_offset(name))) \
- : "r" (__i)); \
- } else if (sizeof(__val) == 8) { \
- u_long __l; \
- __l = *(u_long *)&__val; \
-- __asm __volatile("movq %1,%%gs:%0" \
-+ __asm __volatile("mov %1,%%gs:%0" \
- : "=m" (*(u_long *)(__pcpu_offset(name))) \
- : "r" (__l)); \
- } else { \
-@@ -169,7 +169,7 @@
- {
- struct thread *td;
-
-- __asm __volatile("movq %%gs:0,%0" : "=r" (td));
-+ __asm __volatile("mov %%gs:0,%0" : "=r" (td));
- return (td);
- }
- #define curthread (__curthread())
--- sys/amd64/include/cpufunc.h~ 2006-03-02 00:05:29.000000000 +0100
+++ sys/amd64/include/cpufunc.h 2006-03-02 11:11:34.000000000 +0100
@@ -482,7 +482,7 @@
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
