git: 3975d4c9e1be - stable/13 - amd64: add missing ALIGN_TEXT to loops in memset and memmove

[Mateusz Guzik]

The branch stable/13 has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=3975d4c9e1be53c2a4977acaa314bcdc18c02416

commit 3975d4c9e1be53c2a4977acaa314bcdc18c02416
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-01-29 15:09:14 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-02-01 12:39:18 +0000

    amd64: add missing ALIGN_TEXT to loops in memset and memmove
    
    (cherry picked from commit 164c3b81848bc81dc200b12370999474225447a3)
---
 lib/libc/amd64/string/memmove.S | 2 ++
 lib/libc/amd64/string/memset.S  | 1 +
 sys/amd64/amd64/support.S       | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/lib/libc/amd64/string/memmove.S b/lib/libc/amd64/string/memmove.S
index accc86440610..4797140a1c16 100644
--- a/lib/libc/amd64/string/memmove.S
+++ b/lib/libc/amd64/string/memmove.S
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 	cmpq	$256,%rcx
 	ja	1256f
 
+	ALIGN_TEXT
 103200:
 	movq	(%rsi),%rdx
 	movq	%rdx,(%rdi)
@@ -198,6 +199,7 @@ __FBSDID("$FreeBSD$");
 	cmpq	$32,%rcx
 	jb	2016f
 
+	ALIGN_TEXT
 2032:
 	movq	(%rsi),%rdx
 	movq	%rdx,(%rdi)
diff --git a/lib/libc/amd64/string/memset.S b/lib/libc/amd64/string/memset.S
index 67f21714b3d1..0639573a4a3e 100644
--- a/lib/libc/amd64/string/memset.S
+++ b/lib/libc/amd64/string/memset.S
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 	cmpq	$256,%rcx
 	ja	1256f
 
+	ALIGN_TEXT
 103200:
 	movq	%r10,(%rdi)
 	movq	%r10,8(%rdi)
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index b0ef54a27ca1..35e73e413e87 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -322,6 +322,7 @@ END(memcmp)
 	cmpq	$256,%rcx
 	ja	1256f
 
+	ALIGN_TEXT
 103200:
 	movq	(%rsi),%rdx
 	movq	%rdx,(%rdi)
@@ -455,6 +456,7 @@ END(memcmp)
 	cmpq	$32,%rcx
 	jb	2016f
 
+	ALIGN_TEXT
 2032:
 	movq	(%rsi),%rdx
 	movq	%rdx,(%rdi)
@@ -595,6 +597,7 @@ END(memcpy_erms)
 	cmpq	$256,%rcx
 	ja	1256f
 
+	ALIGN_TEXT
 103200:
 	movq	%r10,(%rdi)
 	movq	%r10,8(%rdi)