From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 2 Aug 2017 15:32:00 +0000 (-0700)
Subject: i386: Don't define multiarch __memmove_chk in libc.a [BZ #21791]
X-Git-Tag: glibc-2.27~1255
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b358255f953943967398e19066eb266c6ea881b9;p=thirdparty%2Fglibc.git

i386: Don't define multiarch __memmove_chk in libc.a [BZ #21791]

There is no need to define multiarch __memmove_chk in libc.a since they
aren't used at all.

	[BZ #21791]
	* sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S
	(MEMCPY_CHK): Define only if SHARED is defined.
	* sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S (MEMCPY_CHK):
	Likewise.
	* sysdeps/i386/i686/multiarch/memcpy-ssse3.S (MEMCPY_CHK):
	Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 20826ea98c5..337d37e87ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,2 +1,11 @@
+2017-08-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #21791]
+	* sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S
+	(MEMCPY_CHK): Define only if SHARED is defined.
+	* sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S (MEMCPY_CHK):
+	Likewise.
+	* sysdeps/i386/i686/multiarch/memcpy-ssse3.S (MEMCPY_CHK):
+	Likewise.
 
 See ChangeLog.18 for earlier changes.
diff --git a/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S b/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S
index 2fe2072cb18..fd3f499baa6 100644
--- a/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S
+++ b/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S
@@ -56,7 +56,7 @@
 # define RETURN	RETURN_END; CFI_PUSH (%ebx)
 
 	.section .text.sse2,"ax",@progbits
-# if !defined USE_AS_BCOPY
+# if !defined USE_AS_BCOPY && defined SHARED
 ENTRY (MEMCPY_CHK)
 	movl	12(%esp), %eax
 	cmpl	%eax, 16(%esp)
diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
index 687e0831477..46d6597055d 100644
--- a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
+++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
@@ -100,7 +100,7 @@
 #endif
 
 	.section .text.ssse3,"ax",@progbits
-#if !defined USE_AS_BCOPY
+#if !defined USE_AS_BCOPY && defined SHARED
 ENTRY (MEMCPY_CHK)
 	movl	12(%esp), %eax
 	cmpl	%eax, 16(%esp)
diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
index 53e8a6ca1db..8b33153d214 100644
--- a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
@@ -89,7 +89,7 @@
 # endif
 
 	.section .text.ssse3,"ax",@progbits
-# if !defined USE_AS_BCOPY
+# if !defined USE_AS_BCOPY && defined SHARED
 ENTRY (MEMCPY_CHK)
 	movl	12(%esp), %eax
 	cmpl	%eax, 16(%esp)