6c0556
commit 98966749f2b418825ff2ea496a0ee89fe63d2cc8
6c0556
Author: Florian Weimer <fweimer@redhat.com>
6c0556
Date:   Wed Nov 10 15:21:37 2021 +0100
6c0556
6c0556
    s390: Use long branches across object boundaries (jgh instead of jh)
6c0556
    
6c0556
    Depending on the layout chosen by the linker, the 16-bit displacement
6c0556
    of the jh instruction is insufficient to reach the target label.
6c0556
    
6c0556
    Analysis of the linker failure was carried out by Nick Clifton.
6c0556
    
6c0556
    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
6c0556
    Reviewed-by: Stefan Liebler <stli@linux.ibm.com>
6c0556
6c0556
diff --git a/sysdeps/s390/memmem-arch13.S b/sysdeps/s390/memmem-arch13.S
6c0556
index b59d60acf0f6aaa0..4faede0cd2f942e3 100644
6c0556
--- a/sysdeps/s390/memmem-arch13.S
6c0556
+++ b/sysdeps/s390/memmem-arch13.S
6c0556
@@ -41,7 +41,7 @@ ENTRY(MEMMEM_ARCH13)
6c0556
 #  error The arch13 variant of memmem needs the z13 variant of memmem!
6c0556
 # endif
6c0556
 	clgfi	%r5,9
6c0556
-	jh	MEMMEM_Z13
6c0556
+	jgh	MEMMEM_Z13
6c0556
 
6c0556
 	aghik	%r0,%r5,-1		/* vll needs highest index.  */
6c0556
 	bc	4,0(%r14)		/* cc==1: return if needle-len == 0.  */
6c0556
diff --git a/sysdeps/s390/strstr-arch13.S b/sysdeps/s390/strstr-arch13.S
6c0556
index faa969849e09c2e1..ffc34c2523ce635a 100644
6c0556
--- a/sysdeps/s390/strstr-arch13.S
6c0556
+++ b/sysdeps/s390/strstr-arch13.S
6c0556
@@ -49,7 +49,7 @@ ENTRY(STRSTR_ARCH13)
6c0556
 #  error The arch13 variant of strstr needs the z13 variant of strstr!
6c0556
 # endif
6c0556
 	clgfi	%r4,9
6c0556
-	jh	STRSTR_Z13
6c0556
+	jgh	STRSTR_Z13
6c0556
 
6c0556
 	/* In case of a partial match, the vstrs instruction returns the index
6c0556
 	   of the partial match in a vector-register.  Then we have to