Module Name: src
Committed By: uebayasi
Date: Fri May 23 03:17:31 UTC 2014
Modified Files:
src/common/lib/libc/arch/i386/atomic: atomic.S
src/common/lib/libc/arch/i386/gen: byte_swap_2.S byte_swap_4.S
src/common/lib/libc/arch/i386/string: memset.S
src/common/lib/libc/arch/i386/string/small: memcpy.S
Log Message:
Put missing END() markers to set ELF symbol size.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/common/lib/libc/arch/i386/atomic/atomic.S
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/i386/gen/byte_swap_2.S \
src/common/lib/libc/arch/i386/gen/byte_swap_4.S
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/i386/string/memset.S
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/i386/string/small/memcpy.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/i386/atomic/atomic.S
diff -u src/common/lib/libc/arch/i386/atomic/atomic.S:1.21 src/common/lib/libc/arch/i386/atomic/atomic.S:1.22
--- src/common/lib/libc/arch/i386/atomic/atomic.S:1.21 Tue Apr 22 19:27:17 2014
+++ src/common/lib/libc/arch/i386/atomic/atomic.S Fri May 23 03:17:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.S,v 1.21 2014/04/22 19:27:17 christos Exp $ */
+/* $NetBSD: atomic.S,v 1.22 2014/05/23 03:17:31 uebayasi Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -58,6 +58,7 @@ ENTRY(_atomic_add_32)
LOCK(1)
addl %eax, (%edx)
ret
+END(_atomic_add_32)
ENTRY(_atomic_add_32_nv)
movl 4(%esp), %edx
@@ -67,6 +68,7 @@ ENTRY(_atomic_add_32_nv)
xaddl %eax, (%edx)
addl %ecx, %eax
ret
+END(_atomic_add_32_nv)
ENTRY(_atomic_and_32)
movl 4(%esp), %edx
@@ -74,6 +76,7 @@ ENTRY(_atomic_and_32)
LOCK(3)
andl %eax, (%edx)
ret
+END(_atomic_and_32)
ENTRY(_atomic_and_32_nv)
movl 4(%esp), %edx
@@ -88,12 +91,14 @@ ENTRY(_atomic_and_32_nv)
ret
1:
jmp 0b
+END(_atomic_and_32_nv)
ENTRY(_atomic_dec_32)
movl 4(%esp), %edx
LOCK(5)
decl (%edx)
ret
+END(_atomic_dec_32)
ENTRY(_atomic_dec_32_nv)
movl 4(%esp), %edx
@@ -102,12 +107,14 @@ ENTRY(_atomic_dec_32_nv)
xaddl %eax, (%edx)
decl %eax
ret
+END(_atomic_dec_32_nv)
ENTRY(_atomic_inc_32)
movl 4(%esp), %edx
LOCK(7)
incl (%edx)
ret
+END(_atomic_inc_32)
ENTRY(_atomic_inc_32_nv)
movl 4(%esp), %edx
@@ -116,6 +123,7 @@ ENTRY(_atomic_inc_32_nv)
xaddl %eax, (%edx)
incl %eax
ret
+END(_atomic_inc_32_nv)
ENTRY(_atomic_or_32)
movl 4(%esp), %edx
@@ -123,6 +131,7 @@ ENTRY(_atomic_or_32)
LOCK(9)
orl %eax, (%edx)
ret
+END(_atomic_or_32)
ENTRY(_atomic_or_32_nv)
movl 4(%esp), %edx
@@ -137,12 +146,14 @@ ENTRY(_atomic_or_32_nv)
ret
1:
jmp 0b
+END(_atomic_or_32_nv)
ENTRY(_atomic_swap_32)
movl 4(%esp), %edx
movl 8(%esp), %eax
xchgl %eax, (%edx)
ret
+END(_atomic_swap_32)
ENTRY(_atomic_cas_32)
movl 4(%esp), %edx
@@ -152,6 +163,7 @@ ENTRY(_atomic_cas_32)
cmpxchgl %ecx, (%edx)
/* %eax now contains the old value */
ret
+END(_atomic_cas_32)
ENTRY(_atomic_cas_32_ni)
movl 4(%esp), %edx
@@ -160,23 +172,27 @@ ENTRY(_atomic_cas_32_ni)
cmpxchgl %ecx, (%edx)
/* %eax now contains the old value */
ret
+END(_atomic_cas_32_ni)
ENTRY(_membar_consumer)
LOCK(13)
addl $0, -4(%esp)
ret
+END(_membar_consumer)
ENDLABEL(membar_consumer_end)
ENTRY(_membar_producer)
/* A store is enough */
movl $0, -4(%esp)
ret
+END(_membar_producer)
ENDLABEL(membar_producer_end)
ENTRY(_membar_sync)
LOCK(14)
addl $0, -4(%esp)
ret
+END(_membar_sync)
ENDLABEL(membar_sync_end)
#if defined(__HAVE_ATOMIC64_OPS) || defined(_KERNEL)
@@ -209,6 +225,7 @@ ENTRY(_atomic_cas_64)
movl 0(%edi), %eax
movl 4(%edi), %edx
jmp 1b
+END(_atomic_cas_64)
ENDLABEL(_atomic_cas_64_end)
ENTRY(_atomic_cas_cx8)
@@ -231,6 +248,7 @@ ENTRY(_atomic_cas_cx8)
.space 32, 0x90
#endif
#endif /* _HARDKERNEL */
+END(_atomic_cas_cx8)
ENDLABEL(_atomic_cas_cx8_end)
#endif /* __HAVE_ATOMIC64_OPS || _KERNEL */
@@ -238,11 +256,13 @@ ENDLABEL(_atomic_cas_cx8_end)
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:
Index: src/common/lib/libc/arch/i386/gen/byte_swap_2.S
diff -u src/common/lib/libc/arch/i386/gen/byte_swap_2.S:1.3 src/common/lib/libc/arch/i386/gen/byte_swap_2.S:1.4
--- src/common/lib/libc/arch/i386/gen/byte_swap_2.S:1.3 Wed Nov 28 17:03:35 2007
+++ src/common/lib/libc/arch/i386/gen/byte_swap_2.S Fri May 23 03:17:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: byte_swap_2.S,v 1.3 2007/11/28 17:03:35 ad Exp $ */
+/* $NetBSD: byte_swap_2.S,v 1.4 2014/05/23 03:17:31 uebayasi Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
#include <machine/asm.h>
#if defined(LIBC_SCCS)
- RCSID("$NetBSD: byte_swap_2.S,v 1.3 2007/11/28 17:03:35 ad Exp $")
+ RCSID("$NetBSD: byte_swap_2.S,v 1.4 2014/05/23 03:17:31 uebayasi Exp $")
#endif
#if defined(_KERNEL) || defined(_STANDALONE)
@@ -50,3 +50,10 @@ _PROF_PROLOGUE
movzwl 4(%esp),%eax
xchgb %al, %ah
ret
+#if defined(_KERNEL) || defined(_STANDALONE)
+END(_C_LABEL(bswap16))
+#else /* defined(_KERNEL) || defined(_STANDALONE) */
+END(_C_LABEL(__bswap16))
+#endif /* defined(_KERNEL) || defined(_STANDALONE) */
+END(_C_LABEL(ntohs))
+END(_C_LABEL(htons))
Index: src/common/lib/libc/arch/i386/gen/byte_swap_4.S
diff -u src/common/lib/libc/arch/i386/gen/byte_swap_4.S:1.3 src/common/lib/libc/arch/i386/gen/byte_swap_4.S:1.4
--- src/common/lib/libc/arch/i386/gen/byte_swap_4.S:1.3 Wed Nov 28 17:03:35 2007
+++ src/common/lib/libc/arch/i386/gen/byte_swap_4.S Fri May 23 03:17:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: byte_swap_4.S,v 1.3 2007/11/28 17:03:35 ad Exp $ */
+/* $NetBSD: byte_swap_4.S,v 1.4 2014/05/23 03:17:31 uebayasi Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
#include <machine/asm.h>
#if defined(LIBC_SCCS)
- RCSID("$NetBSD: byte_swap_4.S,v 1.3 2007/11/28 17:03:35 ad Exp $")
+ RCSID("$NetBSD: byte_swap_4.S,v 1.4 2014/05/23 03:17:31 uebayasi Exp $")
#endif
#if defined(_KERNEL) || defined(_STANDALONE)
@@ -50,3 +50,10 @@ _PROF_PROLOGUE
movl 4(%esp),%eax
bswap %eax
ret
+#if defined(_KERNEL) || defined(_STANDALONE)
+END(_C_LABEL(bswap32))
+#else /* defined(_KERNEL) || defined(_STANDALONE) */
+END(_C_LABEL(__bswap32))
+#endif /* defined(_KERNEL) || defined(_STANDALONE) */
+END(_C_LABEL(ntohl))
+END(_C_LABEL(htonl))
Index: src/common/lib/libc/arch/i386/string/memset.S
diff -u src/common/lib/libc/arch/i386/string/memset.S:1.4 src/common/lib/libc/arch/i386/string/memset.S:1.5
--- src/common/lib/libc/arch/i386/string/memset.S:1.4 Tue Apr 29 06:53:01 2008
+++ src/common/lib/libc/arch/i386/string/memset.S Fri May 23 03:17:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: memset.S,v 1.4 2008/04/29 06:53:01 martin Exp $ */
+/* $NetBSD: memset.S,v 1.5 2014/05/23 03:17:31 uebayasi Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <machine/asm.h>
#if defined(LIBC_SCCS)
- RCSID("$NetBSD: memset.S,v 1.4 2008/04/29 06:53:01 martin Exp $")
+ RCSID("$NetBSD: memset.S,v 1.5 2014/05/23 03:17:31 uebayasi Exp $")
#endif
#ifdef BZERO
@@ -104,3 +104,8 @@ ENTRY(memset)
#endif
popl %edi
ret
+#ifdef BZERO
+END(bzero)
+#else
+END(memset)
+#endif
Index: src/common/lib/libc/arch/i386/string/small/memcpy.S
diff -u src/common/lib/libc/arch/i386/string/small/memcpy.S:1.1 src/common/lib/libc/arch/i386/string/small/memcpy.S:1.2
--- src/common/lib/libc/arch/i386/string/small/memcpy.S:1.1 Thu Jun 16 16:39:14 2011
+++ src/common/lib/libc/arch/i386/string/small/memcpy.S Fri May 23 03:17:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpy.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/* $NetBSD: memcpy.S,v 1.2 2014/05/23 03:17:31 uebayasi Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <machine/asm.h>
- RCSID("$NetBSD: memcpy.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+ RCSID("$NetBSD: memcpy.S,v 1.2 2014/05/23 03:17:31 uebayasi Exp $")
# ifdef BCOPY
ENTRY(bcopy)
@@ -68,4 +68,9 @@ __memmove_start:
popl %edi
popl %esi
ret
+END(memcpy)
+END(memmove)
# endif /* MEMMOVE */
+# ifdef BCOPY
+END(bcopy)
+# endif
