Unverified Commit e05973a5 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

lib.systems.doubles: add aarch64-windows double (#335067)

parents fa87437f fb917de1

lib/systems/doubles.nix

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ let 
    "wasm64-wasi" "wasm32-wasi"



    # Windows

    "x86_64-windows" "i686-windows"

    "aarch64-windows" "x86_64-windows" "i686-windows"

  ];



  allParsed = map parse.mkSystemFromString all;

lib/systems/examples.nix

+7 −0
Original line number Diff line number Diff line
@@ -325,6 +325,13 @@ rec { 
    libc = "ucrt"; # This distinguishes the mingw (non posix) toolchain

  };



  # LLVM-based mingw-w64 for ARM

  ucrtAarch64 = {

    config = "aarch64-w64-mingw32";

    libc = "ucrt";

    useLLVM = true;

  };



  # BSDs



  x86_64-freebsd = {

lib/tests/systems.nix

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ lib.runTests ( 
  testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" ];

  testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];

  testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];

  testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];

  testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "aarch64-windows" "i686-windows" "x86_64-windows" ];

  testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox);

})

pkgs/development/compilers/llvm/common/compiler-rt/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ let 
  # use clean up the `cmakeFlags` rats nest below.

  haveLibcxx = stdenv.cc.libcxx != null;

  isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic && lib.versionAtLeast release_version "16";

  inherit (stdenv.hostPlatform) isMusl isAarch64;

  noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic;

  inherit (stdenv.hostPlatform) isMusl isAarch64 isWindows;

  noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic || isWindows;



  baseName = "compiler-rt";

  pname = baseName + lib.optionalString (haveLibc) "-libc";

pkgs/development/compilers/llvm/common/libcxx/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ let 
  ]) ++ lib.optionals stdenv.hostPlatform.isWasm [

    "-DLIBCXXABI_ENABLE_THREADS=OFF"

    "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"

  ] ++ lib.optionals (!enableShared) [

  ] ++ lib.optionals (!enableShared || stdenv.hostPlatform.isWindows) [

    # Required on Windows due to https://github.com/llvm/llvm-project/issues/55245

    "-DLIBCXXABI_ENABLE_SHARED=OFF"

  ];
@@ -91,6 +92,9 @@ let 
    "-DLIBCXX_ENABLE_THREADS=OFF"

    "-DLIBCXX_ENABLE_FILESYSTEM=OFF"

    "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"

  ] ++ lib.optionals stdenv.hostPlatform.isWindows [

    # https://github.com/llvm/llvm-project/issues/55245

    "-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON"

  ] ++ lib.optionals (!enableShared) [

    "-DLIBCXX_ENABLE_SHARED=OFF"

  ] ++ lib.optionals (cxxabi != null && cxxabi.libName == "cxxrt") [