summaryrefslogtreecommitdiff
path: root/src/string
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-04-18 21:18:23 -0400
committerRich Felker <dalias@aerifal.cx>2015-04-18 21:18:23 -0400
commitb35c4c475bea3c8f938d8e9696d1138eabb54a89 (patch)
tree40d3f046173125a3a038e8b8c912bbcf35ac1003 /src/string
parent8ed66ecbcba1dd0f899f22b534aac92a282f42d5 (diff)
downloadmusl-b35c4c475bea3c8f938d8e9696d1138eabb54a89.tar.gz
musl-b35c4c475bea3c8f938d8e9696d1138eabb54a89.tar.bz2
musl-b35c4c475bea3c8f938d8e9696d1138eabb54a89.tar.xz
musl-b35c4c475bea3c8f938d8e9696d1138eabb54a89.zip
remove potentially PIC-incompatible relocations from x86_64 and x32 asm
analogous to commit 8ed66ecbcba1dd0f899f22b534aac92a282f42d5 for i386.
Diffstat (limited to 'src/string')
-rw-r--r--src/string/x86_64/memcpy.s3
-rw-r--r--src/string/x86_64/memmove.s3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/string/x86_64/memcpy.s b/src/string/x86_64/memcpy.s
index 1282dc3b..3d960efa 100644
--- 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 247f0ac3..172c0252 100644
--- 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