NPTL is no longer an add-on!

sysdeps/unix/sysv/linux/aarch64/Implies

@@ -1,2 +1,3 @@
+aarch64/nptl
 unix/sysv/linux/generic
 unix/sysv/linux/wordsize-64

sysdeps/unix/sysv/linux/alpha/Implies

@@ -1,3 +1,4 @@
+alpha/nptl
 unix/sysv/linux/wordsize-64
 # These supply the ABI compatibility for when long double was double.
 ieee754/ldbl-64-128

sysdeps/unix/sysv/linux/arm/Implies

@@ -0,0 +1 @@
+arm/nptl

sysdeps/unix/sysv/linux/configure

@@ -158,33 +158,6 @@ if test -n "$sysheaders"; then
   CPPFLAGS=$OLD_CPPFLAGS
 fi
 
-# Under Linux the NPTL add-on should be available.
-case $add_ons in
-  # It is available.  Good.
-  *nptl*)
-    nptl_missing=
-    ;;
-  *)
-    nptl_missing=yes
-    ;;
-esac
-
-if test "$nptl_missing"; then
-  if test $enable_sanity = yes; then
-    echo "\
-*** On GNU/Linux systems it is normal to compile GNU libc with the
-*** \`nptl' add-on.  Without that, the library will be
-*** incompatible with normal GNU/Linux systems.
-*** If you really mean to not use this add-on, run configure again
-*** using the extra parameter \`--disable-sanity-checks'."
-    exit 1
-  else
-    echo "\
-*** WARNING: Are you sure you do not want to use the \`nptl'
-*** add-on?"
-  fi
-fi
-
 if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/" -o "$prefix" = "NONE"; then
   if test $enable_sanity = yes; then
     echo "\

sysdeps/unix/sysv/linux/configure.ac

@@ -81,33 +81,6 @@ if test -n "$sysheaders"; then
   CPPFLAGS=$OLD_CPPFLAGS
 fi
 
-# Under Linux the NPTL add-on should be available.
-case $add_ons in
-  # It is available.  Good.
-  *nptl*)
-    nptl_missing=
-    ;;
-  *)
-    nptl_missing=yes
-    ;;
-esac
-
-if test "$nptl_missing"; then
-  if test $enable_sanity = yes; then
-    echo "\
-*** On GNU/Linux systems it is normal to compile GNU libc with the
-*** \`nptl' add-on.  Without that, the library will be
-*** incompatible with normal GNU/Linux systems.
-*** If you really mean to not use this add-on, run configure again
-*** using the extra parameter \`--disable-sanity-checks'."
-    exit 1
-  else
-    echo "\
-*** WARNING: Are you sure you do not want to use the \`nptl'
-*** add-on?"
-  fi
-fi
-
 if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/" -o "$prefix" = "NONE"; then
   if test $enable_sanity = yes; then
     echo "\

sysdeps/unix/sysv/linux/hppa/Implies

@@ -0,0 +1 @@
+hppa/nptl

sysdeps/unix/sysv/linux/i386/Implies

@@ -1 +1,2 @@
 unix/sysv/linux/x86
+i386/nptl

sysdeps/unix/sysv/linux/i386/i686/Implies

@@ -0,0 +1 @@
+i386/i686/nptl

sysdeps/unix/sysv/linux/ia64/Implies

@@ -1 +1,2 @@
+ia64/nptl
 unix/sysv/linux/wordsize-64

sysdeps/unix/sysv/linux/m68k/Implies

@@ -0,0 +1 @@
+m68k/nptl

sysdeps/unix/sysv/linux/microblaze/Implies

@@ -0,0 +1 @@
+microblaze/nptl

sysdeps/unix/sysv/linux/mips/Implies

@@ -0,0 +1 @@
+mips/nptl

sysdeps/unix/sysv/linux/powerpc/Implies

@@ -0,0 +1 @@
+powerpc/nptl

sysdeps/unix/sysv/linux/s390/Implies

@@ -1,3 +1,5 @@
+s390/nptl
+
 # These supply the ABI compatibility for when long double was double.
 ieee754/ldbl-64-128
 ieee754/ldbl-opt

sysdeps/unix/sysv/linux/sh/Implies

@@ -0,0 +1 @@
+sh/nptl

sysdeps/unix/sysv/linux/sparc/Implies

@@ -0,0 +1 @@
+sparc/nptl

sysdeps/unix/sysv/linux/tile/Implies

@@ -0,0 +1 @@
+tile/nptl

sysdeps/unix/sysv/linux/x86_64/Implies

@@ -1,2 +1,3 @@
 unix/sysv/linux/x86
 unix/sysv/linux/wordsize-64
+x86_64/nptl

sysdeps/unix/sysv/linux/x86_64/x32/Implies

@@ -0,0 +1 @@
+x86_64/x32/nptl