remove potentially PIC-incompatible relocations from x86_64 and x32 asm

analogous to commit 8ed66ecbcba1dd0f899f22b534aac92a282f42d5 for i386.

diff --git a/src/math/x32/expl.s b/src/math/x32/expl.s
index aabea45e154abdb4847ddb420ca822a02d2e7bc9..369f7bd2167b562163233a868bc0091b3bb32740 100644 (file)
--- a/src/math/x32/expl.s
+++ b/src/math/x32/expl.s
@@ -37,7 +37,7 @@ expl:
        fstpt (%esp)
        fstpt 16(%esp)
        fstpt 32(%esp)
-       call exp2l
+       call exp2l@PLT
                # if 2^hi == inf return 2^hi
        fld %st(0)
        fstpt (%esp)

diff --git a/src/math/x86_64/expl.s b/src/math/x86_64/expl.s
index 3add810d583f4d377ccdfd88cf5cec47cfe64962..798261d2835346a9d219f1e45b276c09b6b795c2 100644 (file)
--- a/src/math/x86_64/expl.s
+++ b/src/math/x86_64/expl.s
@@ -37,7 +37,7 @@ expl:
        fstpt (%rsp)
        fstpt 16(%rsp)
        fstpt 32(%rsp)
-       call exp2l
+       call exp2l@PLT
                # if 2^hi == inf return 2^hi
        fld %st(0)
        fstpt (%rsp)

diff --git a/src/signal/x32/sigsetjmp.s b/src/signal/x32/sigsetjmp.s
index d354d6802a9e32108c7bdbd2ea6e65cf6d6beaf5..9a7695f96dc951d6c531f0b580bb71c21fa79ce8 100644 (file)
--- a/src/signal/x32/sigsetjmp.s
+++ b/src/signal/x32/sigsetjmp.s
@@ -11,7 +11,7 @@ __sigsetjmp:
        mov %rbx,72+8(%rdi)
        mov %rdi,%rbx
 
-       call setjmp
+       call setjmp@PLT
 
        pushq 64(%rbx)
        mov %rbx,%rdi
@@ -21,4 +21,4 @@ __sigsetjmp:
 .hidden __sigsetjmp_tail
        jmp __sigsetjmp_tail
 
-1:     jmp setjmp
+1:     jmp setjmp@PLT

diff --git a/src/signal/x86_64/sigsetjmp.s b/src/signal/x86_64/sigsetjmp.s
index d354d6802a9e32108c7bdbd2ea6e65cf6d6beaf5..9a7695f96dc951d6c531f0b580bb71c21fa79ce8 100644 (file)
--- a/src/signal/x86_64/sigsetjmp.s
+++ b/src/signal/x86_64/sigsetjmp.s
@@ -11,7 +11,7 @@ __sigsetjmp:
        mov %rbx,72+8(%rdi)
        mov %rdi,%rbx
 
-       call setjmp
+       call setjmp@PLT
 
        pushq 64(%rbx)
        mov %rbx,%rdi
@@ -21,4 +21,4 @@ __sigsetjmp:
 .hidden __sigsetjmp_tail
        jmp __sigsetjmp_tail
 
-1:     jmp setjmp
+1:     jmp setjmp@PLT

diff --git a/src/string/x86_64/memcpy.s b/src/string/x86_64/memcpy.s
index 1282dc3b0573fdffc5f223a6f275f4d13187e080..3d960efa8936441dc468b243e75885880435df46 100644 (file)
--- a/src/string/x86_64/memcpy.s
+++ b/src/string/x86_64/memcpy.s
@@ -1,6 +1,9 @@
 .global memcpy
+.global __memcpy_fwd
+.hidden __memcpy_fwd
 .type memcpy,@function
 memcpy:
+__memcpy_fwd:
        mov %rdi,%rax
        cmp $8,%rdx
        jc 1f

diff --git a/src/string/x86_64/memmove.s b/src/string/x86_64/memmove.s
index 247f0ac387973ce0c39c507f96e590552c74a77d..172c025206a3e81e9db34a38581e34a4ac02a4f8 100644 (file)
--- a/src/string/x86_64/memmove.s
+++ b/src/string/x86_64/memmove.s
@@ -4,7 +4,8 @@ memmove:
        mov %rdi,%rax
        sub %rsi,%rax
        cmp %rdx,%rax
-       jae memcpy
+.hidden __memcpy_fwd
+       jae __memcpy_fwd
        mov %rdx,%rcx
        lea -1(%rdi,%rdx),%rdi
        lea -1(%rsi,%rdx),%rsi