diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2022-12-07 19:26:40 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2022-12-07 19:26:40 +0000 |
| commit | 336e8a5c45e8007d4b8d777ca6964d5ebdd2fe3f (patch) | |
| tree | 772e8212de28bae0a7ff7435045e431a225feb3e /sys/lib | |
| parent | fa2d8ca89eae06a25bc70129e3641ccd922f3ada (diff) | |
Add END()s to match ENTRY()s.
ok deraadt@
Diffstat (limited to 'sys/lib')
| -rw-r--r-- | sys/lib/libkern/arch/amd64/memmove.S | 3 | ||||
| -rw-r--r-- | sys/lib/libkern/arch/amd64/scanc.S | 1 | ||||
| -rw-r--r-- | sys/lib/libkern/arch/amd64/skpc.S | 1 | ||||
| -rw-r--r-- | sys/lib/libkern/arch/amd64/strchr.S | 3 | ||||
| -rw-r--r-- | sys/lib/libkern/arch/amd64/strcmp.S | 3 | ||||
| -rw-r--r-- | sys/lib/libkern/arch/amd64/strlen.S | 3 | ||||
| -rw-r--r-- | sys/lib/libkern/arch/amd64/strrchr.S | 3 |
7 files changed, 13 insertions, 4 deletions
diff --git a/sys/lib/libkern/arch/amd64/memmove.S b/sys/lib/libkern/arch/amd64/memmove.S index 5a5939f4fea..e10113a3745 100644 --- a/sys/lib/libkern/arch/amd64/memmove.S +++ b/sys/lib/libkern/arch/amd64/memmove.S @@ -88,3 +88,6 @@ ENTRY(memcpy) 3: RETGUARD_CHECK(memmove, r10) ret lfence +END(bcopy) +END(memmove) +END(memcpy) diff --git a/sys/lib/libkern/arch/amd64/scanc.S b/sys/lib/libkern/arch/amd64/scanc.S index 582343584d8..1c1d98841a8 100644 --- a/sys/lib/libkern/arch/amd64/scanc.S +++ b/sys/lib/libkern/arch/amd64/scanc.S @@ -55,3 +55,4 @@ ENTRY(scanc) RETGUARD_CHECK(scanc, r10) ret lfence +END(scanc) diff --git a/sys/lib/libkern/arch/amd64/skpc.S b/sys/lib/libkern/arch/amd64/skpc.S index a8b3dfbe89a..0f9b4430339 100644 --- a/sys/lib/libkern/arch/amd64/skpc.S +++ b/sys/lib/libkern/arch/amd64/skpc.S @@ -49,3 +49,4 @@ ENTRY(skpc) RETGUARD_CHECK(skpc, r10) ret lfence +END(skpc) diff --git a/sys/lib/libkern/arch/amd64/strchr.S b/sys/lib/libkern/arch/amd64/strchr.S index ad8a7ca5023..f2e5ed1a8ac 100644 --- a/sys/lib/libkern/arch/amd64/strchr.S +++ b/sys/lib/libkern/arch/amd64/strchr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: strchr.S,v 1.6 2022/12/07 18:25:32 guenther Exp $ */ +/* $OpenBSD: strchr.S,v 1.7 2022/12/07 19:26:39 guenther Exp $ */ /* $NetBSD: strchr.S,v 1.7 2014/03/22 19:16:34 jakllsch Exp $ */ /*- @@ -128,3 +128,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/sys/lib/libkern/arch/amd64/strcmp.S b/sys/lib/libkern/arch/amd64/strcmp.S index 12f10bacab4..abd49c2fd27 100644 --- a/sys/lib/libkern/arch/amd64/strcmp.S +++ b/sys/lib/libkern/arch/amd64/strcmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: strcmp.S,v 1.5 2022/12/07 18:25:33 guenther Exp $ */ +/* $OpenBSD: strcmp.S,v 1.6 2022/12/07 19:26:39 guenther Exp $ */ /* $NetBSD: strcmp.S,v 1.2 2014/03/22 19:16:34 jakllsch Exp $ */ /* @@ -72,3 +72,4 @@ ENTRY(strcmp) RETGUARD_CHECK(strcmp, r10) ret lfence +END(strcmp) diff --git a/sys/lib/libkern/arch/amd64/strlen.S b/sys/lib/libkern/arch/amd64/strlen.S index 03bceca944c..73cdfe5693d 100644 --- a/sys/lib/libkern/arch/amd64/strlen.S +++ b/sys/lib/libkern/arch/amd64/strlen.S @@ -1,4 +1,4 @@ -/* $OpenBSD: strlen.S,v 1.9 2022/12/07 18:25:33 guenther Exp $ */ +/* $OpenBSD: strlen.S,v 1.10 2022/12/07 19:26:39 guenther Exp $ */ /* $NetBSD: strlen.S,v 1.6 2014/03/22 19:16:34 jakllsch Exp $ */ /*- @@ -157,3 +157,4 @@ ENTRY(strlen) dec %rsi or %rsi,%rdx /* low bytes now non-zero */ jmp 2b +END(strlen) diff --git a/sys/lib/libkern/arch/amd64/strrchr.S b/sys/lib/libkern/arch/amd64/strrchr.S index a32af2bfb13..9747d45bdca 100644 --- a/sys/lib/libkern/arch/amd64/strrchr.S +++ b/sys/lib/libkern/arch/amd64/strrchr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: strrchr.S,v 1.5 2022/12/07 18:25:33 guenther Exp $ */ +/* $OpenBSD: strrchr.S,v 1.6 2022/12/07 19:26:39 guenther Exp $ */ /* $NetBSD: strrchr.S,v 1.3 2014/03/22 19:16:34 jakllsch Exp $ */ /* @@ -124,3 +124,4 @@ ENTRY(strrchr) RETGUARD_CHECK(strrchr, r10) ret lfence +END(strrchr) |