12 files changed, 21 insertions, 5 deletions

diff --git a/lib/libc/powerpc/SYS.h b/lib/libc/powerpc/SYS.h
index e9b6d3226c97..8d019144cdd6 100644
--- a/lib/libc/powerpc/SYS.h
+++ b/lib/libc/powerpc/SYS.h
@@ -58,7 +58,8 @@ ENTRY(__sys_##name);						\
 	WEAK_REFERENCE(__sys_##name, _##name);			\
 	_SYSCALL(name);						\
 	bnslr;							\
-	b	CNAME(HIDENAME(cerror))
+	b	CNAME(HIDENAME(cerror));			\
+END(__sys_##name)
 
 #define	RSYSCALL(name)						\
 	.text;							\
@@ -68,4 +69,5 @@ ENTRY(__sys_##name);						\
 	WEAK_REFERENCE(__sys_##name, _##name);			\
 	_SYSCALL(name);						\
 	bnslr;							\
-	b	CNAME(HIDENAME(cerror))
+	b	CNAME(HIDENAME(cerror));			\
+END(__sys_##name)
diff --git a/lib/libc/powerpc64/SYS.h b/lib/libc/powerpc64/SYS.h
index cc1c268adf29..9ca5af4b70ed 100644
--- a/lib/libc/powerpc64/SYS.h
+++ b/lib/libc/powerpc64/SYS.h
@@ -74,7 +74,8 @@ ENTRY(__sys_##name);						\
 	addi	%r1,%r1,48;					\
 	ld	%r0,16(%r1);					\
 	mtlr	%r0;						\
-	blr;
+	blr;							\
+END(__sys_##name)
 
 #define	RSYSCALL(name)						\
 	.text;							\
@@ -93,4 +94,5 @@ ENTRY(__sys_##name);						\
 	addi	%r1,%r1,48;					\
 	ld	%r0,16(%r1);					\
 	mtlr	%r0;						\
-	blr;
+	blr;							\
+END(__sys_##name)
diff --git a/lib/libc/powerpc64/sys/cerror.S b/lib/libc/powerpc64/sys/cerror.S
index 515d7e541cab..3362c9fdf046 100644
--- a/lib/libc/powerpc64/sys/cerror.S
+++ b/lib/libc/powerpc64/sys/cerror.S
@@ -56,5 +56,6 @@ ENTRY_NOPROF(HIDENAME(cerror))
 	li	%r3,-1
 	li	%r4,-1
 	blr
+END(HIDENAME(cerror))
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libthr/arch/i386/i386/_umtx_op_err.S b/lib/libthr/arch/i386/i386/_umtx_op_err.S
index 113412c85100..dad6495132f7 100644
--- a/lib/libthr/arch/i386/i386/_umtx_op_err.S
+++ b/lib/libthr/arch/i386/i386/_umtx_op_err.S
@@ -31,7 +31,10 @@
 
 #define SYSCALL_ERR(x)		 			\
 			ENTRY(__CONCAT(x, _err));	\
-			mov __CONCAT($SYS_,x),%eax; int $0x80; ret
+			mov __CONCAT($SYS_,x),%eax;	\
+			int $0x80;			\
+			ret;				\
+			END(__CONCAT(x, _err))
 
 SYSCALL_ERR(_umtx_op)
 
diff --git a/lib/msun/i387/e_logf.S b/lib/msun/i387/e_logf.S
index 51f12e76e04f..01511af1c750 100644
--- a/lib/msun/i387/e_logf.S
+++ b/lib/msun/i387/e_logf.S
@@ -13,5 +13,6 @@ ENTRY(logf)
 	flds	4(%esp)
 	fyl2x
 	ret
+END(logf)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/msun/i387/e_remainderl.S b/lib/msun/i387/e_remainderl.S
index bdbd2ba2bdaa..3dac08836405 100644
--- a/lib/msun/i387/e_remainderl.S
+++ b/lib/msun/i387/e_remainderl.S
@@ -46,5 +46,6 @@ ENTRY(remainderl)
 	jp	1b
 	fstp	%st(1)
 	ret
+END(remainderl)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/msun/i387/e_sqrtl.S b/lib/msun/i387/e_sqrtl.S
index 3a5ef3e666f5..aec8fbd9e533 100644
--- a/lib/msun/i387/e_sqrtl.S
+++ b/lib/msun/i387/e_sqrtl.S
@@ -40,5 +40,6 @@ ENTRY(sqrtl)
 	fldt	4(%esp)
 	fsqrt
 	ret
+END(sqrtl)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/msun/i387/s_llrintl.S b/lib/msun/i387/s_llrintl.S
index 0fe97b82f1b0..aa349cbc1aae 100644
--- a/lib/msun/i387/s_llrintl.S
+++ b/lib/msun/i387/s_llrintl.S
@@ -34,5 +34,6 @@ ENTRY(llrintl)
 	popl	%eax
 	popl	%edx
 	ret
+END(llrintl)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/msun/i387/s_logbl.S b/lib/msun/i387/s_logbl.S
index 685da943c510..f175e7b51a40 100644
--- a/lib/msun/i387/s_logbl.S
+++ b/lib/msun/i387/s_logbl.S
@@ -41,5 +41,6 @@ ENTRY(logbl)
 	fxtract
 	fstp	%st
 	ret
+END(logbl)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/msun/i387/s_lrintl.S b/lib/msun/i387/s_lrintl.S
index fb7f2612013a..9a8b467a3c13 100644
--- a/lib/msun/i387/s_lrintl.S
+++ b/lib/msun/i387/s_lrintl.S
@@ -33,5 +33,6 @@ ENTRY(lrintl)
 	fistpl	(%esp)
 	popl	%eax
 	ret
+END(lrintl)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/msun/i387/s_remquol.S b/lib/msun/i387/s_remquol.S
index df149dff4aef..59a62cbefe7d 100644
--- a/lib/msun/i387/s_remquol.S
+++ b/lib/msun/i387/s_remquol.S
@@ -61,5 +61,6 @@ ENTRY(remquol)
 	movl	28(%esp),%ecx
 	movl	%eax,(%ecx)
 	ret
+END(remquol)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/msun/i387/s_rintl.S b/lib/msun/i387/s_rintl.S
index edb9573ffc63..8be8d96ebcdb 100644
--- a/lib/msun/i387/s_rintl.S
+++ b/lib/msun/i387/s_rintl.S
@@ -40,5 +40,6 @@ ENTRY(rintl)
 	fldt	4(%esp)
 	frndint
 	ret
+END(rintl)
 
 	.section .note.GNU-stack,"",%progbits