mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 14:25:49 +00:00
Code Issues Releases Wiki Activity

compel/x86: clang-3.4 isn't a friend to numbers in macro

Browse Source 
It's a workaround to clang-3.4, which doesn't handle numbers
in asm macros rightly:
https://llvm.org/bugs/show_bug.cgi?id=21500

Which resulted in:
  CC       compel/arch/x86/plugins/std/parasite-head.o
<instantiation>:3:2: error: too few operands for instruction
 pushq
 ^
compel/arch/x86/plugins/std/parasite-head.S:26:2: note: while in macro instantiation
 PARASITE_ENTRY
 ^

Fixes: https://travis-ci.org/0x7f454c46/criu/jobs/186099057

travis-ci: success for 32-bit tests fixes
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Dmitry Safonov
2017-01-09 20:19:09 +03:00
committed by Andrei Vagin
parent be783a3768
commit cbde93e12e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compel/arch/x86/plugins/std/parasite-head.S
View File

@@ -6,10 +6,10 @@
# error 64-bit parasite should compile with CONFIG_X86_64
#endif
.macro PARASITE_ENTRY
.macro PARASITE_ENTRY num
subq $16, %rsp
andq $~15, %rsp
pushq $0
pushq $\num
movq %rsp, %rbp
movl __export_parasite_cmd(%rip), %edi
leaq __export_parasite_args(%rip), %rsi
@@ -23,7 +23,7 @@ ENTRY(__export_parasite_head_start_compat)
jmp $__USER_CS,$1f
1:
.code64
PARASITE_ENTRY
PARASITE_ENTRY 0
pushq $__USER32_CS
pushq $2f
lretq
@@ -43,7 +43,7 @@ END(__export_parasite_head_start_compat)
#endif
ENTRY(__export_parasite_head_start)
PARASITE_ENTRY
PARASITE_ENTRY 0
int $0x03
END(__export_parasite_head_start)