Skip to content

Commit

Permalink
lib, glibc: Get rid of withTLS
Browse files Browse the repository at this point in the history
glibc removed the underlying flag in 2011 in
83cd14204559abbb52635006832eaf4d2f42514a [1].

This gets us one step closer to fixing NixOS#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
  • Loading branch information
Ericson2314 committed Jan 26, 2018
1 parent 94a2af9 commit 8a20c0e
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
6 changes: 0 additions & 6 deletions lib/systems/examples.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ rec {
bigEndian = false;
arch = "armv5tel";
float = "soft";
withTLS = true;
libc = "glibc";
platform = platforms.sheevaplug;
openssl.system = "linux-generic32";
Expand All @@ -26,7 +25,6 @@ rec {
arch = "armv6l";
float = "hard";
fpu = "vfp";
withTLS = true;
libc = "glibc";
platform = platforms.raspberrypi;
openssl.system = "linux-generic32";
Expand All @@ -38,7 +36,6 @@ rec {
arch = "armv7-a";
float = "hard";
fpu = "vfpv3-d16";
withTLS = true;
libc = "glibc";
platform = platforms.armv7l-hf-multiplatform;
openssl.system = "linux-generic32";
Expand All @@ -48,7 +45,6 @@ rec {
config = "aarch64-unknown-linux-gnu";
bigEndian = false;
arch = "aarch64";
withTLS = true;
libc = "glibc";
platform = platforms.aarch64-multiplatform;
};
Expand All @@ -67,7 +63,6 @@ rec {

libc = "glibc";

withTLS = true;
openssl.system = "linux-generic32";
};

Expand All @@ -76,7 +71,6 @@ rec {
bigEndian = false;
arch = "mips";
float = "hard";
withTLS = true;
libc = "glibc";
platform = platforms.fuloong2f_n32;
openssl.system = "linux-generic32";
Expand Down
3 changes: 0 additions & 3 deletions pkgs/development/libraries/glibc/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ stdenv.mkDerivation ({
] ++ lib.optionals withLinuxHeaders [
"--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
] ++ 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")
] ++ lib.optionals (cross != null) [
"--with-__thread"
Expand Down Expand Up @@ -190,8 +189,6 @@ stdenv.mkDerivation ({
libc_cv_forced_unwind=yes
libc_cv_c_cleanup=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
export BUILD_CC=gcc
Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5364,7 +5364,6 @@ with pkgs;
bigEndian = true;
arch = "mips";
float = "soft";
withTLS = true;
libc = "uclibc";
platform = {
name = "ben_nanonote";
Expand Down

0 comments on commit 8a20c0e

Please sign in to comment.