resolved merge conflicts

[rust.git] / configure

diff --git a/configure b/configure
index c5ecc2236894cf0c5cb6cf2c4214249b2a648a2b..db41f0dfb94f388be9b8c405fa34def58bf29b62 100755 (executable)
--- a/configure
+++ b/configure
@@ -510,7 +510,6 @@ valopt default-ar     "ar" "the default ar"
 opt_nosave manage-submodules 1 "let the build manage the git submodules"
 opt_nosave clang 0 "prefer clang to gcc for building the runtime"
 opt_nosave jemalloc 1 "build liballoc with jemalloc"
-opt elf-tls 1 "elf thread local storage on platforms where supported"
 opt full-bootstrap 0 "build three compilers instead of two"
 opt extended 0 "build an extended rust tool set"