Skip to content

Commit fcf0116

Browse files
Rename TLS to NPTL and make default
Rename --tls/--no-tls options to --nptl/--no-nptl while retaining same meaning. Make --nptl default, instead of --no-nptl. Signed-off-by: Anton Kolesov <[email protected]>
1 parent 3aeaaf7 commit fcf0116

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

build-all.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,11 @@
245245
# the gcc repository. If build is done from the source tarball, then
246246
# current date is used.
247247

248-
# --tls | --no-tls
248+
# --nptl | --no-nptl
249249

250-
# When building with tls support the uClibc tool chain will
251-
# support threading and thread local storage (TLS).
252-
# (default --no-tls)
250+
# When building Linux toolchain with NPTL support, it will support
251+
# threading and thread local storage (TLS) and will use NPTL instead of old
252+
# threads library. (default --nptl)
253253

254254
# --checkout-config <config>
255255

@@ -334,7 +334,7 @@ HOST_INSTALL=install
334334
SED=sed
335335
RELEASE_NAME=
336336
is_tarball=
337-
TLS_SUPPORT="no"
337+
NPTL_SUPPORT="yes"
338338
CHECKOUT_CONFIG=
339339

340340
# Default multilib usage and conversion for toolchain building
@@ -525,11 +525,11 @@ case ${opt} in
525525
RELEASE_NAME="$1"
526526
;;
527527

528-
--tls)
529-
TLS_SUPPORT="yes"
528+
--nptl)
529+
NPTL_SUPPORT="yes"
530530
;;
531-
--no-tls)
532-
TLS_SUPPORT="no"
531+
--no-nptl)
532+
NPTL_SUPPORT="no"
533533
;;
534534

535535
--checkout-config)
@@ -735,7 +735,7 @@ then
735735
fi
736736
export SED
737737
export RELEASE_NAME
738-
export TLS_SUPPORT
738+
export NPTL_SUPPORT
739739
export CHECKOUT_CONFIG
740740

741741
# Set up a logfile

build-uclibc.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@
9393
# Make target prefix to install host application. Should be either
9494
# "install" or "install-strip".
9595

96-
# TLS_SUPPORT
96+
# NPTL_SUPPORT
9797

98-
# Build with threading and thread local storage support if this is
98+
# Build with threading, thread local storage support and NPTL if this is
9999
# set to "yes".
100100

101101
# We source the script arc-init.sh to set up variables needed by the script
@@ -334,7 +334,7 @@ else
334334
fi
335335

336336
# Patch the defconfig for thread support.
337-
if [ "x${TLS_SUPPORT}" = "xyes" ]
337+
if [ "x${NPTL_SUPPORT}" = "xyes" ]
338338
then
339339
${SED} -e 's@LINUXTHREADS_OLD=y@UCLIBC_HAS_THREADS_NATIVE=y@' \
340340
-i ${TEMP_DEFCFG}
@@ -359,7 +359,7 @@ else
359359
exit 1
360360
fi
361361

362-
if [ "x${TLS_SUPPORT}" = "xyes" ]
362+
if [ "x${NPTL_SUPPORT}" = "xyes" ]
363363
then
364364
thread_flags="--enable-threads --enable-tls"
365365
else
@@ -443,7 +443,7 @@ else
443443
fi
444444

445445
# Patch the defconfig for thread support.
446-
if [ "x${TLS_SUPPORT}" = "xyes" ]
446+
if [ "x${NPTL_SUPPORT}" = "xyes" ]
447447
then
448448
${SED} -e 's@LINUXTHREADS_OLD=y@UCLIBC_HAS_THREADS_NATIVE=y@' \
449449
-i ${TEMP_DEFCFG}

0 commit comments

Comments
 (0)