public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib, glibc: Get rid of withTLS

Browse Source 
glibc removed the underlying flag in 2011 in
83cd14204559abbb52635006832eaf4d2f42514a [1].

This gets us one step closer to fixing #34274: the cross stdenv for
aarch64-unknown-linux-gnu at least evals now.

Thanks to @Dezgeg for doing all the research for this.

[1]: https://sourceware.org/git/?p=glibc.git;a=commit;h=83cd14204559abbb52635006832eaf4d2f42514a
This commit is contained in:
John Ericson 2018-01-26 13:26:44 -05:00 committed by Tuomas Tynkkynen
parent 314fb3d60a
commit 71f814a889
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/systems/examples.nix
View File

@ -14,7 +14,6 @@ rec {
bigEndian = false; bigEndian = false;
arch = "armv5tel"; arch = "armv5tel";
float = "soft"; float = "soft";
withTLS = true;
libc = "glibc"; libc = "glibc";
platform = platforms.sheevaplug; platform = platforms.sheevaplug;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
@ -26,7 +25,6 @@ rec {
arch = "armv6l"; arch = "armv6l";
float = "hard"; float = "hard";
fpu = "vfp"; fpu = "vfp";
withTLS = true;
libc = "glibc"; libc = "glibc";
platform = platforms.raspberrypi; platform = platforms.raspberrypi;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
@ -38,7 +36,6 @@ rec {
arch = "armv7-a"; arch = "armv7-a";
float = "hard"; float = "hard";
fpu = "vfpv3-d16"; fpu = "vfpv3-d16";
withTLS = true;
libc = "glibc"; libc = "glibc";
platform = platforms.armv7l-hf-multiplatform; platform = platforms.armv7l-hf-multiplatform;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
@ -48,7 +45,6 @@ rec {
config = "aarch64-unknown-linux-gnu"; config = "aarch64-unknown-linux-gnu";
bigEndian = false; bigEndian = false;
arch = "aarch64"; arch = "aarch64";
withTLS = true;
libc = "glibc"; libc = "glibc";
platform = platforms.aarch64-multiplatform; platform = platforms.aarch64-multiplatform;
}; };
@ -67,7 +63,6 @@ rec {
libc = "glibc"; libc = "glibc";
withTLS = true;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
}; };
@ -76,7 +71,6 @@ rec {
bigEndian = false; bigEndian = false;
arch = "mips"; arch = "mips";
float = "hard"; float = "hard";
withTLS = true;
libc = "glibc"; libc = "glibc";
platform = platforms.fuloong2f_n32; platform = platforms.fuloong2f_n32;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";

3
pkgs/development/libraries/glibc/common.nix
View File

@ -127,7 +127,6 @@ stdenv.mkDerivation ({
] ++ lib.optionals withLinuxHeaders [ ] ++ lib.optionals withLinuxHeaders [
"--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
] ++ lib.optionals (cross != null) [ ] ++ lib.optionals (cross != null) [
(if cross.withTLS then "--with-tls" else "--without-tls")
(if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
] ++ lib.optionals (cross != null) [ ] ++ lib.optionals (cross != null) [
"--with-__thread" "--with-__thread"
@ -190,8 +189,6 @@ stdenv.mkDerivation ({
libc_cv_forced_unwind=yes libc_cv_forced_unwind=yes
libc_cv_c_cleanup=yes libc_cv_c_cleanup=yes
libc_cv_gnu89_inline=yes libc_cv_gnu89_inline=yes
# Only due to a problem in gcc configure scripts:
libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"}
EOF EOF
export BUILD_CC=gcc export BUILD_CC=gcc

1
pkgs/top-level/all-packages.nix
View File

@ -5366,7 +5366,6 @@ with pkgs;
bigEndian = true; bigEndian = true;
arch = "mips"; arch = "mips";
float = "soft"; float = "soft";
withTLS = true;
libc = "uclibc"; libc = "uclibc";
platform = { platform = {
name = "ben_nanonote"; name = "ben_nanonote";