From 30481d01ce6ff06d4bff1a423b644303e4d8084f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Thu, 21 Aug 2008 09:48:00 +0000 Subject: Move the threading model choice back to the C library menu: - the threading models available are dependent on the C library used - it is thus easier to first select the C libary, and then the threading model, rather going back to the toolchain menu. /trunk/config/toolchain.in | 29 0 29 0 ----------------------------- /trunk/config/libc.in | 47 38 9 0 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 38 insertions(+), 38 deletions(-) --- config/libc.in | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) (limited to 'config/libc.in') diff --git a/config/libc.in b/config/libc.in index 69ce3b13..e9a6ad93 100644 --- a/config/libc.in +++ b/config/libc.in @@ -13,6 +13,10 @@ config LIBC_GLIBC select LIBC_SUPPORT_NPTL select LIBC_SUPPORT_LINUXTHREADS +if LIBC_GLIBC +source config/libc/glibc.in +endif + config LIBC_EGLIBC bool prompt "eglibc (EXPERIMENTAL)" @@ -20,11 +24,19 @@ config LIBC_EGLIBC select LIBC_SUPPORT_LINUXTHREADS depends on EXPERIMENTAL +if LIBC_EGLIBC +source config/libc/eglibc.in +endif + config LIBC_UCLIBC bool prompt "uClibc" select LIBC_SUPPORT_LINUXTHREADS +if LIBC_UCLIBC +source config/libc/uClibc.in +endif + endchoice config LIBC_VERSION @@ -44,17 +56,34 @@ config LIBC_SUPPORT_LINUXTHREADS bool default n -if LIBC_GLIBC -source config/libc/glibc.in -endif +choice + bool + prompt "Threading implementation to use:" + default THREADS_NPTL if LIBC_SUPPORT_NPTL + default THREADS_LINUXTHREADS if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL + default THREADS_NONE if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL -if LIBC_EGLIBC -source config/libc/eglibc.in -endif +config THREADS_NPTL + bool + prompt "nptl" + depends on LIBC_SUPPORT_NPTL -if LIBC_UCLIBC -source config/libc/uClibc.in -endif +config THREADS_LINUXTHREADS + bool + prompt "linuxthreads" + depends on LIBC_SUPPORT_LINUXTHREADS + +config THREADS_NONE + bool + prompt "none" + +endchoice + +config THREADS + string + default "nptl" if THREADS_NPTL + default "linuxthreads" if THREADS_LINUXTHREADS + default "none" if THREADS_NONE config LIBC_VERSION help -- cgit v1.2.3