machines/x86: Drop redundant glibc configure knobs

nptl and thereby tls are not optional anymore

(From OE-Core rev: 1a4b277e47a8d624cde4c73713d036e230f3a523)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc
index af583ae..78d4458 100644 (file)
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/ia32-base.inc
@@ -18,11 +18,6 @@ KERNEL_IMAGETYPE ?= "bzImage"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 
 #
-# glibc-related variables
-#
-GLIBC_ADDONS ?= "nptl"
-
-#
 # kernel-related variables
 #
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"

diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 285054a..8d4bd6f 100644 (file)
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -26,7 +26,4 @@ require conf/machine/include/qemu.inc
 
 MACHINE_FEATURES += "x86"
 
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"

diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index c81afe5..6edf386 100644 (file)
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -26,8 +26,4 @@ require conf/machine/include/qemu.inc
 
 MACHINE_FEATURES += "x86"
 
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
-