about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/qt-5
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-05-05 23:40:20 +0000
committerAlyssa Ross <hi@alyssa.is>2020-11-27 13:28:18 +0000
commit56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600 (patch)
tree8cdbfcec6eee3e6c28d990a1071241c25e126e26 /nixpkgs/pkgs/development/libraries/qt-5
parent84875aacac4550333888ac4a5624c08157c3a673 (diff)
downloadnixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar
nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar.gz
nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar.bz2
nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar.lz
nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar.xz
nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.tar.zst
nixlib-56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600.zip
platform.gcc.arch: support for AMD CPUs
(cherry picked from commit 463db72e631e0bd4a835796324eb1981071c6ee4)
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qt-5')
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
index a4c12793abb3..33054dd403f9 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -259,6 +259,7 @@ stdenv.mkDerivation {
       then [ "-no-sse2" ]
       else lib.optionals (compareVersion "5.9.0" >= 0) {
         default        = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ];
+        # Intel
         westmere       = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2" "-no-avx" "-no-avx2" ];
         sandybridge    = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx" "-no-avx2" ];
         ivybridge      = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx" "-no-avx2" ];
@@ -266,6 +267,14 @@ stdenv.mkDerivation {
         broadwell      = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx"    "-avx2" ];
         skylake        = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx"    "-avx2" ];
         skylake-avx512 = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx"    "-avx2" ];
+        # AMD
+        btver1         = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2" "-no-avx" "-no-avx2" ];
+        btver2         = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx" "-no-avx2" ];
+        bdver1         = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx" "-no-avx2" ];
+        bdver2         = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx" "-no-avx2" ];
+        bdver3         = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx" "-no-avx2" ];
+        bdver4         = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx"    "-avx2" ];
+        znver1         = [ "-sse2"    "-sse3"    "-ssse3"    "-sse4.1"    "-sse4.2"    "-avx"    "-avx2" ];
       }.${stdenv.hostPlatform.platform.gcc.arch or "default"}
     )
     ++ [