From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 24 May 2017 13:31:16 +0000 (-0700)
Subject: x86: Don't include cacheinfo.c in ld.so
X-Git-Tag: glibc-2.26~460
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c450f6f6f0e2089b780d0510ae6153740fc7d1d;p=thirdparty%2Fglibc.git

x86: Don't include cacheinfo.c in ld.so

Since cacheinfo.c isn't used by ld.so, there is no need to include it
in ld.so.

	* sysdeps/x86/cacheinfo.c: Skip if not in libc.
---

diff --git a/ChangeLog b/ChangeLog
index 80a6c3ec972..4abd668481f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86/cacheinfo.c: Skip if not in libc.
+
 2017-05-24  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86/cacheinfo.c (is_intel): Removed.
diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c
index 4594a2fa60f..12ffeef5b53 100644
--- a/sysdeps/x86/cacheinfo.c
+++ b/sysdeps/x86/cacheinfo.c
@@ -16,6 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#if IS_IN (libc)
+
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -768,3 +770,5 @@ intel_bug_no_cache_info:
      store becomes faster.  */
   __x86_shared_non_temporal_threshold = __x86_shared_cache_size * 6;
 }
+
+#endif