From 53e48b83063de07a16ea5264575c79888434bb1e Mon Sep 17 00:00:00 2001 From: uebayasi Date: Fri, 29 May 2015 08:50:12 +0000 Subject: [PATCH] Put obvious END() macros that match ENTRY() entries. --- lib/libc/arch/amd64/gen/_setjmp.S | 4 +++- lib/libc/arch/amd64/gen/fabs.S | 3 ++- lib/libc/arch/amd64/gen/flt_rounds.S | 3 ++- lib/libc/arch/amd64/gen/fpgetmask.S | 7 ++++++- lib/libc/arch/amd64/gen/fpgetround.S | 7 ++++++- lib/libc/arch/amd64/gen/fpgetsticky.S | 7 ++++++- lib/libc/arch/amd64/gen/fpsetmask.S | 7 ++++++- lib/libc/arch/amd64/gen/fpsetround.S | 7 ++++++- lib/libc/arch/amd64/gen/fpsetsticky.S | 7 ++++++- lib/libc/arch/amd64/gen/modf.S | 3 ++- lib/libc/arch/amd64/gen/setjmp.S | 4 +++- lib/libc/arch/amd64/gen/sigsetjmp.S | 4 +++- 12 files changed, 51 insertions(+), 12 deletions(-) diff --git a/lib/libc/arch/amd64/gen/_setjmp.S b/lib/libc/arch/amd64/gen/_setjmp.S index d9a59f7aa14..6895cc2717d 100644 --- a/lib/libc/arch/amd64/gen/_setjmp.S +++ b/lib/libc/arch/amd64/gen/_setjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: _setjmp.S,v 1.1 2004/01/28 01:44:45 mickey Exp $ */ +/* $OpenBSD: _setjmp.S,v 1.2 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: _setjmp.S,v 1.1 2001/06/19 00:25:02 fvdl Exp $ */ /* @@ -63,6 +63,7 @@ ENTRY(_setjmp) xorl %eax,%eax ret +END(_setjmp) ENTRY(_longjmp) movq (_JB_RBX * 8)(%rdi),%rbx @@ -80,3 +81,4 @@ ENTRY(_longjmp) incl %eax 1: movq %r11,0(%rsp) ret +END(_longjmp) diff --git a/lib/libc/arch/amd64/gen/fabs.S b/lib/libc/arch/amd64/gen/fabs.S index c91edc528ac..441bccc17ab 100644 --- a/lib/libc/arch/amd64/gen/fabs.S +++ b/lib/libc/arch/amd64/gen/fabs.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fabs.S,v 1.6 2011/07/08 22:28:32 martynas Exp $ */ +/* $OpenBSD: fabs.S,v 1.7 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: fabs.S,v 1.1 2001/06/19 00:25:02 fvdl Exp $ */ #include @@ -15,3 +15,4 @@ ENTRY(fabs) fstpl -8(%rsp) movsd -8(%rsp),%xmm0 ret +END(fabs) diff --git a/lib/libc/arch/amd64/gen/flt_rounds.S b/lib/libc/arch/amd64/gen/flt_rounds.S index 2e0e5f58ef3..d313ed3d40e 100644 --- a/lib/libc/arch/amd64/gen/flt_rounds.S +++ b/lib/libc/arch/amd64/gen/flt_rounds.S @@ -1,4 +1,4 @@ -/* $OpenBSD: flt_rounds.S,v 1.3 2013/04/23 21:02:51 martynas Exp $ */ +/* $OpenBSD: flt_rounds.S,v 1.4 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: flt_rounds.S,v 1.2 2002/06/06 23:04:35 fvdl Exp $ */ /* @@ -28,3 +28,4 @@ ENTRY(__flt_rounds) movb _map(,%rax,1),%al #endif ret +END(__flt_rounds) diff --git a/lib/libc/arch/amd64/gen/fpgetmask.S b/lib/libc/arch/amd64/gen/fpgetmask.S index 688ba49cddc..f0492049b32 100644 --- a/lib/libc/arch/amd64/gen/fpgetmask.S +++ b/lib/libc/arch/amd64/gen/fpgetmask.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fpgetmask.S,v 1.1 2004/01/28 01:44:45 mickey Exp $ */ +/* $OpenBSD: fpgetmask.S,v 1.2 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: fpgetmask.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $ */ /* @@ -25,3 +25,8 @@ ENTRY(fpgetmask) notl %eax andl $63,%eax ret +#ifdef WEAK_ALIAS +END(_fpgetmask) +#else +END(fpgetmask) +#endif diff --git a/lib/libc/arch/amd64/gen/fpgetround.S b/lib/libc/arch/amd64/gen/fpgetround.S index 5220b3ef396..69c09f0d0f1 100644 --- a/lib/libc/arch/amd64/gen/fpgetround.S +++ b/lib/libc/arch/amd64/gen/fpgetround.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fpgetround.S,v 1.1 2004/01/28 01:44:45 mickey Exp $ */ +/* $OpenBSD: fpgetround.S,v 1.2 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: fpgetround.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $ */ /* @@ -24,3 +24,8 @@ ENTRY(fpgetround) rorl $10,%eax andl $3,%eax ret +#ifdef WEAK_ALIAS +END(_fpgetround) +#else +END(fpgetround) +#endif diff --git a/lib/libc/arch/amd64/gen/fpgetsticky.S b/lib/libc/arch/amd64/gen/fpgetsticky.S index fd12e2b500a..4217ee6da12 100644 --- a/lib/libc/arch/amd64/gen/fpgetsticky.S +++ b/lib/libc/arch/amd64/gen/fpgetsticky.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fpgetsticky.S,v 1.1 2004/01/28 01:44:45 mickey Exp $ */ +/* $OpenBSD: fpgetsticky.S,v 1.2 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: fpgetsticky.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $ */ /* @@ -26,3 +26,8 @@ ENTRY(fpgetsticky) orl -8(%rsp),%eax andl $63,%eax ret +#ifdef WEAK_ALIAS +END(_fpgetsticky) +#else +END(fpgetsticky) +#endif diff --git a/lib/libc/arch/amd64/gen/fpsetmask.S b/lib/libc/arch/amd64/gen/fpsetmask.S index 665d55e8e47..8e3dc9b3999 100644 --- a/lib/libc/arch/amd64/gen/fpsetmask.S +++ b/lib/libc/arch/amd64/gen/fpsetmask.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fpsetmask.S,v 1.1 2004/01/28 01:44:45 mickey Exp $ */ +/* $OpenBSD: fpsetmask.S,v 1.2 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: fpsetmask.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $ */ /* @@ -40,3 +40,8 @@ ENTRY(fpsetmask) ldmxcsr -8(%rsp) andl $63,%eax ret +#ifdef WEAK_ALIAS +END(_fpsetmask) +#else +END(fpsetmask) +#endif diff --git a/lib/libc/arch/amd64/gen/fpsetround.S b/lib/libc/arch/amd64/gen/fpsetround.S index b8508f8b6bd..9e6151dd257 100644 --- a/lib/libc/arch/amd64/gen/fpsetround.S +++ b/lib/libc/arch/amd64/gen/fpsetround.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fpsetround.S,v 1.1 2004/01/28 01:44:45 mickey Exp $ */ +/* $OpenBSD: fpsetround.S,v 1.2 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: fpsetround.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $ */ /* @@ -47,3 +47,8 @@ ENTRY(fpsetround) ldmxcsr -8(%rsp) fldcw -4(%rsp) ret +#ifdef WEAK_ALIAS +END(_fpsetround) +#else +END(fpsetround) +#endif diff --git a/lib/libc/arch/amd64/gen/fpsetsticky.S b/lib/libc/arch/amd64/gen/fpsetsticky.S index 68e380d1eed..5715b449e99 100644 --- a/lib/libc/arch/amd64/gen/fpsetsticky.S +++ b/lib/libc/arch/amd64/gen/fpsetsticky.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fpsetsticky.S,v 1.2 2004/07/13 11:01:06 kettenis Exp $ */ +/* $OpenBSD: fpsetsticky.S,v 1.3 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: fpsetsticky.S,v 1.5 2004/03/09 17:16:13 drochner Exp $ */ /* @@ -44,3 +44,8 @@ ENTRY(fpsetsticky) ldmxcsr -32(%rsp) fldenv -28(%rsp) ret +#ifdef WEAK_ALIAS +END(_fpsetsticky) +#else +END(fpsetsticky) +#endif diff --git a/lib/libc/arch/amd64/gen/modf.S b/lib/libc/arch/amd64/gen/modf.S index 38eaade93fc..50525e80d72 100644 --- a/lib/libc/arch/amd64/gen/modf.S +++ b/lib/libc/arch/amd64/gen/modf.S @@ -1,4 +1,4 @@ -/* $OpenBSD: modf.S,v 1.4 2011/07/08 22:28:32 martynas Exp $ */ +/* $OpenBSD: modf.S,v 1.5 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: modf.S,v 1.1 2001/06/19 00:25:03 fvdl Exp $ */ /*- @@ -89,3 +89,4 @@ ENTRY(modf) movsd -8(%rsp),%xmm0 ret +END(modf) diff --git a/lib/libc/arch/amd64/gen/setjmp.S b/lib/libc/arch/amd64/gen/setjmp.S index 1641add9a3a..4a2914d6283 100644 --- a/lib/libc/arch/amd64/gen/setjmp.S +++ b/lib/libc/arch/amd64/gen/setjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: setjmp.S,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ +/* $OpenBSD: setjmp.S,v 1.4 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: __setjmp14.S,v 1.1 2001/06/19 00:25:02 fvdl Exp $ */ /* @@ -73,6 +73,7 @@ ENTRY(setjmp) 2: xorl %eax,%eax ret +END(setjmp) ENTRY(longjmp) movq %rdi,%r12 @@ -101,3 +102,4 @@ ENTRY(longjmp) incl %eax 1: movq %r11,0(%rsp) ret +END(longjmp) diff --git a/lib/libc/arch/amd64/gen/sigsetjmp.S b/lib/libc/arch/amd64/gen/sigsetjmp.S index 51b055a0f58..b236134b20f 100644 --- a/lib/libc/arch/amd64/gen/sigsetjmp.S +++ b/lib/libc/arch/amd64/gen/sigsetjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsetjmp.S,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ +/* $OpenBSD: sigsetjmp.S,v 1.4 2015/05/29 08:50:12 uebayasi Exp $ */ /* $NetBSD: __setjmp14.S,v 1.1 2001/06/19 00:25:02 fvdl Exp $ */ /* @@ -77,6 +77,7 @@ ENTRY(sigsetjmp) 2: xorl %eax,%eax ret +END(sigsetjmp) ENTRY(siglongjmp) movq %rdi,%r12 @@ -105,3 +106,4 @@ ENTRY(siglongjmp) incl %eax 1: movq %r11,0(%rsp) ret +END(siglongjmp) -- 2.20.1