From da69a35566af4405b884220ee72f1f10a98977fa Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 20 Jun 2017 14:03:09 -0700
Subject: Move x86 specific tunables to x86/dl-tunables.list

	* elf/dl-tunables.list: Move x86 specific tunables to ...
	* sysdeps/x86/dl-tunables.list: Here.  New file.
---
 ChangeLog                    |  5 +++++
 elf/dl-tunables.list         | 12 ------------
 sysdeps/x86/dl-tunables.list | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 sysdeps/x86/dl-tunables.list

diff --git a/ChangeLog b/ChangeLog
index 6defb8d53d..158292c829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf/dl-tunables.list: Move x86 specific tunables to ...
+	* sysdeps/x86/dl-tunables.list: Here.  New file.
+
 2017-06-20  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #21635]
diff --git a/elf/dl-tunables.list b/elf/dl-tunables.list
index 3247d49b59..b8b0ce565c 100644
--- a/elf/dl-tunables.list
+++ b/elf/dl-tunables.list
@@ -87,17 +87,5 @@ glibc {
       type: STRING
       security_level: SXID_IGNORE
     }
-    x86_non_temporal_threshold {
-      type: SIZE_T
-      security_level: SXID_IGNORE
-    }
-    x86_data_cache_size {
-      type: SIZE_T
-      security_level: SXID_IGNORE
-    }
-    x86_shared_cache_size {
-      type: SIZE_T
-      security_level: SXID_IGNORE
-    }
   }
 }
diff --git a/sysdeps/x86/dl-tunables.list b/sysdeps/x86/dl-tunables.list
new file mode 100644
index 0000000000..50c130a437
--- /dev/null
+++ b/sysdeps/x86/dl-tunables.list
@@ -0,0 +1,34 @@
+# x86 specific tunables.
+# Copyright (C) 2017 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+
+# The GNU C Library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
+
+glibc {
+  tune {
+    x86_non_temporal_threshold {
+      type: SIZE_T
+      security_level: SXID_IGNORE
+    }
+    x86_data_cache_size {
+      type: SIZE_T
+      security_level: SXID_IGNORE
+    }
+    x86_shared_cache_size {
+      type: SIZE_T
+      security_level: SXID_IGNORE
+    }
+  }
+}
-- 
cgit 1.4.1