Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Put missing END() markers to set ELF symbol size.
details: https://anonhg.NetBSD.org/src/rev/df67e01f32ba
branches: trunk
changeset: 329388:df67e01f32ba
user: uebayasi <uebayasi%NetBSD.org@localhost>
date: Thu May 22 15:21:13 2014 +0000
description:
Put missing END() markers to set ELF symbol size.
diffstat:
common/lib/libc/arch/x86_64/atomic/atomic.S | 33 +++++++++++++++++++-
common/lib/libc/arch/x86_64/gen/byte_swap_2.S | 11 +++++-
common/lib/libc/arch/x86_64/gen/byte_swap_4.S | 11 +++++-
common/lib/libc/arch/x86_64/gen/byte_swap_8.S | 5 +-
common/lib/libc/arch/x86_64/string/memset.S | 6 ++-
lib/libc/compat/arch/x86_64/sys/compat_Ovfork.S | 5 +-
lib/libc/compat/arch/x86_64/sys/compat_sigpending.S | 5 +-
lib/libc/compat/arch/x86_64/sys/compat_sigprocmask.S | 5 +-
lib/libc/compat/arch/x86_64/sys/compat_sigsuspend.S | 5 +-
9 files changed, 69 insertions(+), 17 deletions(-)
diffs (truncated from 419 to 300 lines):
diff -r 63c6d5838712 -r df67e01f32ba common/lib/libc/arch/x86_64/atomic/atomic.S
--- a/common/lib/libc/arch/x86_64/atomic/atomic.S Thu May 22 15:01:56 2014 +0000
+++ b/common/lib/libc/arch/x86_64/atomic/atomic.S Thu May 22 15:21:13 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.S,v 1.16 2011/01/12 23:12:10 joerg Exp $ */
+/* $NetBSD: atomic.S,v 1.17 2014/05/22 15:23:11 uebayasi Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -54,6 +54,7 @@
LOCK(1)
addl %esi, (%rdi)
ret
+END(_atomic_add_32)
ENTRY(_atomic_add_32_nv)
movl %esi, %eax
@@ -61,11 +62,13 @@
xaddl %eax, (%rdi)
addl %esi, %eax
ret
+END(_atomic_add_32_nv)
ENTRY(_atomic_and_32)
LOCK(3)
andl %esi, (%rdi)
ret
+END(_atomic_and_32)
ENTRY(_atomic_and_32_nv)
movl (%rdi), %eax
@@ -77,11 +80,13 @@
jnz 1b
movl %ecx, %eax
ret
+END(_atomic_and_32_nv)
ENTRY(_atomic_dec_32)
LOCK(5)
decl (%rdi)
ret
+END(_atomic_dec_32)
ENTRY(_atomic_dec_32_nv)
movl $-1, %eax
@@ -89,11 +94,13 @@
xaddl %eax, (%rdi)
decl %eax
ret
+END(_atomic_dec_32_nv)
ENTRY(_atomic_inc_32)
LOCK(7)
incl (%rdi)
ret
+END(_atomic_inc_32)
ENTRY(_atomic_inc_32_nv)
movl $1, %eax
@@ -101,11 +108,13 @@
xaddl %eax, (%rdi)
incl %eax
ret
+END(_atomic_inc_32_nv)
ENTRY(_atomic_or_32)
LOCK(9)
orl %esi, (%rdi)
ret
+END(_atomic_or_32)
ENTRY(_atomic_or_32_nv)
movl (%rdi), %eax
@@ -117,11 +126,13 @@
jnz 1b
movl %ecx, %eax
ret
+END(_atomic_or_32_nv)
ENTRY(_atomic_swap_32)
movl %esi, %eax
xchgl %eax, (%rdi)
ret
+END(_atomic_swap_32)
ENTRY(_atomic_cas_32)
movl %esi, %eax
@@ -129,12 +140,14 @@
cmpxchgl %edx, (%rdi)
/* %eax now contains the old value */
ret
+END(_atomic_cas_32)
ENTRY(_atomic_cas_32_ni)
movl %esi, %eax
cmpxchgl %edx, (%rdi)
/* %eax now contains the old value */
ret
+END(_atomic_cas_32_ni)
/* 64-bit */
@@ -142,6 +155,7 @@
LOCK(13)
addq %rsi, (%rdi)
ret
+END(_atomic_add_64)
ENTRY(_atomic_add_64_nv)
movq %rsi, %rax
@@ -149,11 +163,13 @@
xaddq %rax, (%rdi)
addq %rsi, %rax
ret
+END(_atomic_add_64_nv)
ENTRY(_atomic_and_64)
LOCK(15)
andq %rsi, (%rdi)
ret
+END(_atomic_and_64)
ENTRY(_atomic_and_64_nv)
movq (%rdi), %rax
@@ -165,11 +181,13 @@
jnz 1b
movq %rcx, %rax
ret
+END(_atomic_and_64_nv)
ENTRY(_atomic_dec_64)
LOCK(17)
decq (%rdi)
ret
+END(_atomic_dec_64)
ENTRY(_atomic_dec_64_nv)
movq $-1, %rax
@@ -177,11 +195,13 @@
xaddq %rax, (%rdi)
decq %rax
ret
+END(_atomic_dec_64_nv)
ENTRY(_atomic_inc_64)
LOCK(19)
incq (%rdi)
ret
+END(_atomic_inc_64)
ENTRY(_atomic_inc_64_nv)
movq $1, %rax
@@ -189,11 +209,13 @@
xaddq %rax, (%rdi)
incq %rax
ret
+END(_atomic_inc_64_nv)
ENTRY(_atomic_or_64)
LOCK(21)
orq %rsi, (%rdi)
ret
+END(_atomic_or_64)
ENTRY(_atomic_or_64_nv)
movq (%rdi), %rax
@@ -205,11 +227,13 @@
jnz 1b
movq %rcx, %rax
ret
+END(_atomic_or_64_nv)
ENTRY(_atomic_swap_64)
movq %rsi, %rax
xchgq %rax, (%rdi)
ret
+END(_atomic_swap_64)
ENTRY(_atomic_cas_64)
movq %rsi, %rax
@@ -217,12 +241,14 @@
cmpxchgq %rdx, (%rdi)
/* %eax now contains the old value */
ret
+END(_atomic_cas_64)
ENTRY(_atomic_cas_64_ni)
movq %rsi, %rax
cmpxchgq %rdx, (%rdi)
/* %eax now contains the old value */
ret
+END(_atomic_cas_64_ni)
/* memory barriers */
@@ -230,29 +256,34 @@
LOCK(25)
addq $0, -8(%rsp)
ret
+END(_membar_consumer)
ENDLABEL(membar_consumer_end)
ENTRY(_membar_producer)
/* A store is enough */
movq $0, -8(%rsp)
ret
+END(_membar_producer)
ENDLABEL(membar_producer_end)
ENTRY(_membar_sync)
LOCK(26)
addq $0, -8(%rsp)
ret
+END(_membar_sync)
ENDLABEL(membar_sync_end)
#ifdef _HARDKERNEL
ENTRY(sse2_lfence)
lfence
ret
+END(sse2_lfence)
ENDLABEL(sse2_lfence_end)
ENTRY(sse2_mfence)
mfence
ret
+END(sse2_mfence)
ENDLABEL(sse2_mfence_end)
atomic_lockpatch:
diff -r 63c6d5838712 -r df67e01f32ba common/lib/libc/arch/x86_64/gen/byte_swap_2.S
--- a/common/lib/libc/arch/x86_64/gen/byte_swap_2.S Thu May 22 15:01:56 2014 +0000
+++ b/common/lib/libc/arch/x86_64/gen/byte_swap_2.S Thu May 22 15:21:13 2014 +0000
@@ -1,9 +1,9 @@
-/* $NetBSD: byte_swap_2.S,v 1.2 2006/02/04 21:53:31 uwe Exp $ */
+/* $NetBSD: byte_swap_2.S,v 1.3 2014/05/22 15:23:11 uebayasi Exp $ */
#include <machine/asm.h>
#if defined(LIBC_SCCS)
- RCSID("$NetBSD: byte_swap_2.S,v 1.2 2006/02/04 21:53:31 uwe Exp $")
+ RCSID("$NetBSD: byte_swap_2.S,v 1.3 2014/05/22 15:23:11 uebayasi Exp $")
#endif
#if defined(_KERNEL) || defined(_STANDALONE)
@@ -17,3 +17,10 @@
movl %edi,%eax
xchgb %ah,%al
ret
+#if defined(_KERNEL) || defined(_STANDALONE)
+END(_C_LABEL(bswap16))
+#else
+END(_C_LABEL(__bswap16))
+#endif
+END(_C_LABEL(ntohs))
+END(_C_LABEL(htons))
diff -r 63c6d5838712 -r df67e01f32ba common/lib/libc/arch/x86_64/gen/byte_swap_4.S
--- a/common/lib/libc/arch/x86_64/gen/byte_swap_4.S Thu May 22 15:01:56 2014 +0000
+++ b/common/lib/libc/arch/x86_64/gen/byte_swap_4.S Thu May 22 15:21:13 2014 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: byte_swap_4.S,v 1.2 2006/02/04 21:53:31 uwe Exp $ */
+/* $NetBSD: byte_swap_4.S,v 1.3 2014/05/22 15:23:11 uebayasi Exp $ */
#include <machine/asm.h>
#if defined(LIBC_SCCS)
- RCSID("$NetBSD: byte_swap_4.S,v 1.2 2006/02/04 21:53:31 uwe Exp $")
+ RCSID("$NetBSD: byte_swap_4.S,v 1.3 2014/05/22 15:23:11 uebayasi Exp $")
#endif
#if defined(_KERNEL) || defined(_STANDALONE)
@@ -16,3 +16,10 @@
movl %edi,%eax
bswapl %eax
ret
+#if defined(_KERNEL) || defined(_STANDALONE)
+END(_C_LABEL(bswap32))
+#else
+END(_C_LABEL(__bswap32))
+#endif
+END(_C_LABEL(ntohl))
+END(_C_LABEL(htonl))
diff -r 63c6d5838712 -r df67e01f32ba common/lib/libc/arch/x86_64/gen/byte_swap_8.S
--- a/common/lib/libc/arch/x86_64/gen/byte_swap_8.S Thu May 22 15:01:56 2014 +0000
+++ b/common/lib/libc/arch/x86_64/gen/byte_swap_8.S Thu May 22 15:21:13 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: byte_swap_8.S,v 1.1 2010/01/14 02:09:46 joerg Exp $ */
+/* $NetBSD: byte_swap_8.S,v 1.2 2014/05/22 15:23:11 uebayasi Exp $ */
/*
* Written by Frank van der Linden (fvdl%wasabisystems.com@localhost)
@@ -8,10 +8,11 @@
#include <machine/asm.h>
#if defined(LIBC_SCCS)
- RCSID("$NetBSD: byte_swap_8.S,v 1.1 2010/01/14 02:09:46 joerg Exp $")
+ RCSID("$NetBSD: byte_swap_8.S,v 1.2 2014/05/22 15:23:11 uebayasi Exp $")
#endif
ENTRY(bswap64)
bswapq %rdi
Home |
Main Index |
Thread Index |
Old Index