mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-10 18:53:38 +00:00
f44f1e7da7
Building a statically linked UML kernel on a Centos 6.9 host resulted in
the following linking failure (GCC 4.4, glibc-2.12):
/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../lib64/libpthread.a(libpthread.o):
In function `siglongjmp':
(.text+0x8490): multiple definition of `longjmp'
arch/x86/um/built-in.o:/local/users/fainelli/openwrt/trunk/build_dir/target-x86_64_musl/linux-uml/linux-4.4.69/arch/x86/um/setjmp_64.S:44:
first defined here
/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../lib64/libpthread.a(libpthread.o):
In function `sem_open':
(.text+0x77cd): warning: the use of `mktemp' is dangerous, better use
`mkstemp'
collect2: ld returned 1 exit status
make[4]: *** [vmlinux] Error 1
Adopt a solution similar to the one done for vmap where we define
longjmp/setjmp to be kernel_longjmp/setjmp. In the process, make sure we
do rename the functions in arch/x86/um/setjmp_*.S accordingly.
Fixes: a7df4716d1 ("um: link with -lpthread")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
54 lines
1,002 B
ArmAsm
54 lines
1,002 B
ArmAsm
#
|
|
# arch/x86_64/setjmp.S
|
|
#
|
|
# setjmp/longjmp for the x86-64 architecture
|
|
#
|
|
|
|
#
|
|
# The jmp_buf is assumed to contain the following, in order:
|
|
# %rbx
|
|
# %rsp (post-return)
|
|
# %rbp
|
|
# %r12
|
|
# %r13
|
|
# %r14
|
|
# %r15
|
|
# <return address>
|
|
#
|
|
|
|
.text
|
|
.align 4
|
|
.globl kernel_setjmp
|
|
.type kernel_setjmp, @function
|
|
kernel_setjmp:
|
|
pop %rsi # Return address, and adjust the stack
|
|
xorl %eax,%eax # Return value
|
|
movq %rbx,(%rdi)
|
|
movq %rsp,8(%rdi) # Post-return %rsp!
|
|
push %rsi # Make the call/return stack happy
|
|
movq %rbp,16(%rdi)
|
|
movq %r12,24(%rdi)
|
|
movq %r13,32(%rdi)
|
|
movq %r14,40(%rdi)
|
|
movq %r15,48(%rdi)
|
|
movq %rsi,56(%rdi) # Return address
|
|
ret
|
|
|
|
.size kernel_setjmp,.-kernel_setjmp
|
|
|
|
.text
|
|
.align 4
|
|
.globl kernel_longjmp
|
|
.type kernel_longjmp, @function
|
|
kernel_longjmp:
|
|
movl %esi,%eax # Return value (int)
|
|
movq (%rdi),%rbx
|
|
movq 8(%rdi),%rsp
|
|
movq 16(%rdi),%rbp
|
|
movq 24(%rdi),%r12
|
|
movq 32(%rdi),%r13
|
|
movq 40(%rdi),%r14
|
|
movq 48(%rdi),%r15
|
|
jmp *56(%rdi)
|
|
|
|
.size kernel_longjmp,.-kernel_longjmp
|