x86: fix compile error in current tip.git
Gas 2.15 complains about 32-bit registers being used in lea. AS arch/x86/lib/copy_user_64.o /local/scratch-2/jeremy/hg/xen/paravirt/linux/arch/x86/lib/copy_user_64.S: Assembler messages: /local/scratch-2/jeremy/hg/xen/paravirt/linux/arch/x86/lib/copy_user_64.S:188: Error: `(%edx,%ecx,8)' is not a valid 64 bit base/index expression /local/scratch-2/jeremy/hg/xen/paravirt/linux/arch/x86/lib/copy_user_64.S:257: Error: `(%edx,%ecx,8)' is not a valid 64 bit base/index expression AS arch/x86/lib/copy_user_nocache_64.o /local/scratch-2/jeremy/hg/xen/paravirt/linux/arch/x86/lib/copy_user_nocache_64.S: Assembler messages: /local/scratch-2/jeremy/hg/xen/paravirt/linux/arch/x86/lib/copy_user_nocache_64.S:107: Error: `(%edx,%ecx,8)' is not a valid 64 bit base/index expression Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Cc: Vitaly Mayatskikh <v.mayatskih@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Родитель
e54afe3863
Коммит
27cb0a75ba
|
@ -185,7 +185,7 @@ ENTRY(copy_user_generic_unrolled)
|
||||||
30: shll $6,%ecx
|
30: shll $6,%ecx
|
||||||
addl %ecx,%edx
|
addl %ecx,%edx
|
||||||
jmp 60f
|
jmp 60f
|
||||||
40: leal (%edx,%ecx,8),%edx
|
40: lea (%rdx,%rcx,8),%rdx
|
||||||
jmp 60f
|
jmp 60f
|
||||||
50: movl %ecx,%edx
|
50: movl %ecx,%edx
|
||||||
60: jmp copy_user_handle_tail /* ecx is zerorest also */
|
60: jmp copy_user_handle_tail /* ecx is zerorest also */
|
||||||
|
@ -254,7 +254,7 @@ ENTRY(copy_user_generic_string)
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.section .fixup,"ax"
|
.section .fixup,"ax"
|
||||||
11: leal (%edx,%ecx,8),%ecx
|
11: lea (%rdx,%rcx,8),%rcx
|
||||||
12: movl %ecx,%edx /* ecx is zerorest also */
|
12: movl %ecx,%edx /* ecx is zerorest also */
|
||||||
jmp copy_user_handle_tail
|
jmp copy_user_handle_tail
|
||||||
.previous
|
.previous
|
||||||
|
|
|
@ -104,7 +104,7 @@ ENTRY(__copy_user_nocache)
|
||||||
30: shll $6,%ecx
|
30: shll $6,%ecx
|
||||||
addl %ecx,%edx
|
addl %ecx,%edx
|
||||||
jmp 60f
|
jmp 60f
|
||||||
40: leal (%edx,%ecx,8),%edx
|
40: lea (%rdx,%rcx,8),%rdx
|
||||||
jmp 60f
|
jmp 60f
|
||||||
50: movl %ecx,%edx
|
50: movl %ecx,%edx
|
||||||
60: sfence
|
60: sfence
|
||||||
|
|
Загрузка…
Ссылка в новой задаче