From 81af83dd3999903f087ff521acd72984b9808a05 Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi@openbsd.org>
Date: Fri, 29 May 2015 07:21:09 +0000
Subject: [PATCH] Sprinkle END() in some straightforward *.S files that have
 ENTRY().  The resulting *.o have "FUNC" symbols with size set.

---
 lib/libc/arch/amd64/string/bcmp.S    | 1 +
 lib/libc/arch/amd64/string/bzero.S   | 1 +
 lib/libc/arch/amd64/string/ffs.S     | 3 ++-
 lib/libc/arch/amd64/string/memchr.S  | 1 +
 lib/libc/arch/amd64/string/memmove.S | 3 +++
 lib/libc/arch/amd64/string/memset.S  | 1 +
 lib/libc/arch/amd64/string/strchr.S  | 3 ++-
 lib/libc/arch/amd64/string/strcmp.S  | 3 ++-
 lib/libc/arch/amd64/string/strlen.S  | 3 ++-
 lib/libc/arch/amd64/string/strrchr.S | 3 ++-
 10 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/libc/arch/amd64/string/bcmp.S b/lib/libc/arch/amd64/string/bcmp.S
index 3c96a90b340..82d239bd233 100644
--- a/lib/libc/arch/amd64/string/bcmp.S
+++ b/lib/libc/arch/amd64/string/bcmp.S
@@ -18,3 +18,4 @@ ENTRY(bcmp)
 
 L1:	incl	%eax
 L2:	ret
+END(bcmp)
diff --git a/lib/libc/arch/amd64/string/bzero.S b/lib/libc/arch/amd64/string/bzero.S
index 76adafc20ab..e91dd882115 100644
--- a/lib/libc/arch/amd64/string/bzero.S
+++ b/lib/libc/arch/amd64/string/bzero.S
@@ -38,3 +38,4 @@ L1:	movq	%rdx,%rcx		/* zero remainder by bytes */
 	stosb
 
 	ret
+END(bzero)
diff --git a/lib/libc/arch/amd64/string/ffs.S b/lib/libc/arch/amd64/string/ffs.S
index 2666bc49e9d..6738183a4ec 100644
--- a/lib/libc/arch/amd64/string/ffs.S
+++ b/lib/libc/arch/amd64/string/ffs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.S,v 1.1 2004/01/28 01:44:45 mickey Exp $	*/
+/*	$OpenBSD: ffs.S,v 1.2 2015/05/29 07:21:09 uebayasi Exp $	*/
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -16,3 +16,4 @@ ENTRY(ffs)
 	_ALIGN_TEXT
 L1:	xorl	%eax,%eax		/* clear result */
 	ret
+END(ffs)
diff --git a/lib/libc/arch/amd64/string/memchr.S b/lib/libc/arch/amd64/string/memchr.S
index 88fa37462d2..9458f87eb4c 100644
--- a/lib/libc/arch/amd64/string/memchr.S
+++ b/lib/libc/arch/amd64/string/memchr.S
@@ -19,3 +19,4 @@ ENTRY(memchr)
 	ret
 L1:	xorq	%rax,%rax
 	ret
+END(memchr)
diff --git a/lib/libc/arch/amd64/string/memmove.S b/lib/libc/arch/amd64/string/memmove.S
index 6503abbca9f..f8bd571252c 100644
--- a/lib/libc/arch/amd64/string/memmove.S
+++ b/lib/libc/arch/amd64/string/memmove.S
@@ -85,3 +85,6 @@ ENTRY(memmove)
 	movq	%r11,%rax
 	cld
 	ret
+// END(memcpy)
+END(memmove)
+END(bcopy)
diff --git a/lib/libc/arch/amd64/string/memset.S b/lib/libc/arch/amd64/string/memset.S
index 670d9426b13..5b9d9a16ffc 100644
--- a/lib/libc/arch/amd64/string/memset.S
+++ b/lib/libc/arch/amd64/string/memset.S
@@ -53,3 +53,4 @@ L1:	rep
 	movq	%r11,%rax
 
 	ret
+END(memset)
diff --git a/lib/libc/arch/amd64/string/strchr.S b/lib/libc/arch/amd64/string/strchr.S
index 1abef2e629d..a2f02a09664 100644
--- a/lib/libc/arch/amd64/string/strchr.S
+++ b/lib/libc/arch/amd64/string/strchr.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strchr.S,v 1.5 2015/05/15 22:29:37 millert Exp $	*/
+/*	$OpenBSD: strchr.S,v 1.6 2015/05/29 07:21:09 uebayasi Exp $	*/
 /*	$NetBSD: strchr.S,v 1.7 2014/03/22 19:16:34 jakllsch Exp $	*/
 
 /*-
@@ -123,3 +123,4 @@ ENTRY(strchr)
 	sar	%cl,%r10	/* top bytes 0xff */
 	and	%r10,%rax	/* clear lsb from unwanted low bytes */
 	jmp	21b
+END(strchr)
diff --git a/lib/libc/arch/amd64/string/strcmp.S b/lib/libc/arch/amd64/string/strcmp.S
index 4f95e00e782..2aa55f45f15 100644
--- a/lib/libc/arch/amd64/string/strcmp.S
+++ b/lib/libc/arch/amd64/string/strcmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strcmp.S,v 1.4 2014/12/09 15:10:39 reyk Exp $	*/
+/*	$OpenBSD: strcmp.S,v 1.5 2015/05/29 07:21:09 uebayasi Exp $	*/
 /*	$NetBSD: strcmp.S,v 1.2 2014/03/22 19:16:34 jakllsch Exp $	*/
 
 /*
@@ -69,3 +69,4 @@ ENTRY(strcmp)
 	movzbq	%dl,%rdx
 	subq	%rdx,%rax
 	ret
+END(strcmp)
diff --git a/lib/libc/arch/amd64/string/strlen.S b/lib/libc/arch/amd64/string/strlen.S
index 8bd2d4d9587..7e7395385f2 100644
--- a/lib/libc/arch/amd64/string/strlen.S
+++ b/lib/libc/arch/amd64/string/strlen.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strlen.S,v 1.3 2014/12/09 15:10:39 reyk Exp $	*/
+/*	$OpenBSD: strlen.S,v 1.4 2015/05/29 07:21:09 uebayasi Exp $	*/
 /*	$NetBSD: strlen.S,v 1.6 2014/03/22 19:16:34 jakllsch Exp $	*/
 
 /*-
@@ -154,3 +154,4 @@ ENTRY(strlen)
 	dec	%rsi
 	or	%rsi,%rdx		/* low bytes now non-zero */
 	jmp	2b
+END(strlen)
diff --git a/lib/libc/arch/amd64/string/strrchr.S b/lib/libc/arch/amd64/string/strrchr.S
index 6aa8041dc0a..802be5a2831 100644
--- a/lib/libc/arch/amd64/string/strrchr.S
+++ b/lib/libc/arch/amd64/string/strrchr.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strrchr.S,v 1.5 2015/05/15 22:29:37 millert Exp $	*/
+/*	$OpenBSD: strrchr.S,v 1.6 2015/05/29 07:21:09 uebayasi Exp $	*/
 /*	$NetBSD: strrchr.S,v 1.3 2014/03/22 19:16:34 jakllsch Exp $	*/
 
 /*
@@ -121,3 +121,4 @@ ENTRY(strrchr)
 
 .Ldone:
 	ret
+END(strrchr)
-- 
2.20.1