From: uebayasi <uebayasi@openbsd.org>
Date: Fri, 29 May 2015 09:25:28 +0000 (+0000)
Subject: Put END() where appropriate.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9a8fcba86e04d4f367449d09964acff71b609ad9;p=openbsd

Put END() where appropriate.

While here, kill redundant use of _C_LABEL() in ENTRY().
---

diff --git a/lib/libc/arch/amd64/net/htonl.S b/lib/libc/arch/amd64/net/htonl.S
index e4c951a4b40..5d05f5a144e 100644
--- a/lib/libc/arch/amd64/net/htonl.S
+++ b/lib/libc/arch/amd64/net/htonl.S
@@ -1,10 +1,11 @@
-/*	$OpenBSD: htonl.S,v 1.1 2004/01/28 01:44:45 mickey Exp $	*/
+/*	$OpenBSD: htonl.S,v 1.2 2015/05/29 09:25:28 uebayasi Exp $	*/
 
 /* Written by Artur Grabowski. Public Domain */
 
 #include <machine/asm.h>
 
-ENTRY(_C_LABEL(htonl))
+ENTRY(htonl)
 	movl    %edi,%eax
 	bswapl  %eax
 	ret
+END(htonl)
diff --git a/lib/libc/arch/amd64/net/htons.S b/lib/libc/arch/amd64/net/htons.S
index 62295abcd97..36382f7a39a 100644
--- a/lib/libc/arch/amd64/net/htons.S
+++ b/lib/libc/arch/amd64/net/htons.S
@@ -1,11 +1,11 @@
-/*	$OpenBSD: htons.S,v 1.2 2004/02/10 00:08:11 drahn Exp $	*/
+/*	$OpenBSD: htons.S,v 1.3 2015/05/29 09:25:28 uebayasi Exp $	*/
 
 /* Written by Artur Grabowski. Public Domain */
 
 #include <machine/asm.h>
 
-ENTRY(_C_LABEL(htons))
+ENTRY(htons)
 	movl    %edi,%eax
 	xchgb   %ah,%al
 	ret
-
+END(htons)
diff --git a/lib/libc/arch/amd64/net/ntohl.S b/lib/libc/arch/amd64/net/ntohl.S
index 0e39c1317e0..bdd66ad1c88 100644
--- a/lib/libc/arch/amd64/net/ntohl.S
+++ b/lib/libc/arch/amd64/net/ntohl.S
@@ -1,10 +1,11 @@
-/*	$OpenBSD: ntohl.S,v 1.2 2004/02/10 00:08:11 drahn Exp $	*/
+/*	$OpenBSD: ntohl.S,v 1.3 2015/05/29 09:25:28 uebayasi Exp $	*/
 
 /* Written by Artur Grabowski. Public Domain */
 
 #include <machine/asm.h>
 
-ENTRY(_C_LABEL(ntohl))
+ENTRY(ntohl)
 	movl    %edi,%eax
 	bswapl  %eax
 	ret
+END(ntohl)
diff --git a/lib/libc/arch/amd64/net/ntohs.S b/lib/libc/arch/amd64/net/ntohs.S
index 3ee61fc5684..ea2cdd2a32e 100644
--- a/lib/libc/arch/amd64/net/ntohs.S
+++ b/lib/libc/arch/amd64/net/ntohs.S
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ntohs.S,v 1.2 2004/02/10 00:08:11 drahn Exp $	*/
+/*	$OpenBSD: ntohs.S,v 1.3 2015/05/29 09:25:28 uebayasi Exp $	*/
 
 /* Written by Artur Grabowski. Public Domain */
 
 #include <machine/asm.h>
 
-ENTRY(_C_LABEL(ntohs))
+ENTRY(ntohs)
 	movl    %edi,%eax
 	xchgb   %ah,%al
 	ret
-
+END(ntohs)