about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-05-24 06:31:16 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-05-24 06:33:43 -0700
commit9c450f6f6f0e2089b780d0510ae6153740fc7d1d (patch)
tree878e4ca45841773a106fae85e4ee3a7b31cf6a8c
parent7c1d722554dc3422295a36da631e03503b676935 (diff)
downloadglibc-9c450f6f6f0e2089b780d0510ae6153740fc7d1d.tar.gz
glibc-9c450f6f6f0e2089b780d0510ae6153740fc7d1d.tar.xz
glibc-9c450f6f6f0e2089b780d0510ae6153740fc7d1d.zip
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.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/x86/cacheinfo.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 80a6c3ec97..4abd668481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 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.
 	(is_amd): Likewise.
 	(max_cpuid): Likewise.
diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c
index 4594a2fa60..12ffeef5b5 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