| 1 |
commit: be6d7f0b7f0a36d4bbfa30704dbccf6bd76f5754 |
| 2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 31 17:49:38 2015 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 31 17:49:38 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=be6d7f0b |
| 7 |
|
| 8 |
use profile for CPU_FLAGS_X86 where appropriate |
| 9 |
|
| 10 |
a number of the CPU_FLAGS_X86 settings appeared to be trying to use something |
| 11 |
very much like the default from the profile but missing mmxext. Due to this, |
| 12 |
a number of packages like ffmpeg would be broken, where using the profile is |
| 13 |
better. |
| 14 |
|
| 15 |
Modified to remove (comment out) the ones that appeared to be attempting to |
| 16 |
use the default (and failing) while leaving in the settings which are intentionally |
| 17 |
disabling certain unavailable features per sub-arch. |
| 18 |
|
| 19 |
catalyst/arch/amd64.py | 15 ++++++++------- |
| 20 |
catalyst/arch/x86.py | 7 ++++--- |
| 21 |
2 files changed, 12 insertions(+), 10 deletions(-) |
| 22 |
|
| 23 |
diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py |
| 24 |
index dccfa46..1e11be9 100644 |
| 25 |
--- a/catalyst/arch/amd64.py |
| 26 |
+++ b/catalyst/arch/amd64.py |
| 27 |
@@ -13,7 +13,8 @@ class arch_amd64(generic_amd64): |
| 28 |
generic_amd64.__init__(self,myspec) |
| 29 |
self.settings["CFLAGS"]="-O2 -pipe" |
| 30 |
self.settings["CHOST"]="x86_64-pc-linux-gnu" |
| 31 |
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 32 |
+ #lines like this appears to be trying to set the profile default, better to use the profile |
| 33 |
+ #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 34 |
|
| 35 |
class arch_nocona(generic_amd64): |
| 36 |
"improved version of Intel Pentium 4 CPU with 64-bit extensions, MMX, SSE, SSE2 and SSE3 support" |
| 37 |
@@ -21,7 +22,7 @@ class arch_nocona(generic_amd64): |
| 38 |
generic_amd64.__init__(self,myspec) |
| 39 |
self.settings["CFLAGS"]="-O2 -march=nocona -pipe" |
| 40 |
self.settings["CHOST"]="x86_64-pc-linux-gnu" |
| 41 |
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 42 |
+ #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 43 |
|
| 44 |
# Requires gcc 4.3 to use this class |
| 45 |
class arch_core2(generic_amd64): |
| 46 |
@@ -30,7 +31,7 @@ class arch_core2(generic_amd64): |
| 47 |
generic_amd64.__init__(self,myspec) |
| 48 |
self.settings["CFLAGS"]="-O2 -march=core2 -pipe" |
| 49 |
self.settings["CHOST"]="x86_64-pc-linux-gnu" |
| 50 |
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","ssse3"]} |
| 51 |
+ #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","ssse3"]} |
| 52 |
|
| 53 |
class arch_k8(generic_amd64): |
| 54 |
"generic k8, opteron and athlon64 support" |
| 55 |
@@ -38,7 +39,7 @@ class arch_k8(generic_amd64): |
| 56 |
generic_amd64.__init__(self,myspec) |
| 57 |
self.settings["CFLAGS"]="-O2 -march=k8 -pipe" |
| 58 |
self.settings["CHOST"]="x86_64-pc-linux-gnu" |
| 59 |
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]} |
| 60 |
+ #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]} |
| 61 |
|
| 62 |
class arch_k8_sse3(generic_amd64): |
| 63 |
"improved versions of k8, opteron and athlon64 with SSE3 support" |
| 64 |
@@ -46,7 +47,7 @@ class arch_k8_sse3(generic_amd64): |
| 65 |
generic_amd64.__init__(self,myspec) |
| 66 |
self.settings["CFLAGS"]="-O2 -march=k8-sse3 -pipe" |
| 67 |
self.settings["CHOST"]="x86_64-pc-linux-gnu" |
| 68 |
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]} |
| 69 |
+ #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]} |
| 70 |
|
| 71 |
class arch_amdfam10(generic_amd64): |
| 72 |
"AMD Family 10h core based CPUs with x86-64 instruction set support" |
| 73 |
@@ -54,7 +55,7 @@ class arch_amdfam10(generic_amd64): |
| 74 |
generic_amd64.__init__(self,myspec) |
| 75 |
self.settings["CFLAGS"]="-O2 -march=amdfam10 -pipe" |
| 76 |
self.settings["CHOST"]="x86_64-pc-linux-gnu" |
| 77 |
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]} |
| 78 |
+ #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]} |
| 79 |
|
| 80 |
class arch_x32(generic_amd64): |
| 81 |
"builder class for generic x32 (Intel and AMD)" |
| 82 |
@@ -62,7 +63,7 @@ class arch_x32(generic_amd64): |
| 83 |
generic_amd64.__init__(self,myspec) |
| 84 |
self.settings["CFLAGS"]="-O2 -pipe" |
| 85 |
self.settings["CHOST"]="x86_64-pc-linux-gnux32" |
| 86 |
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 87 |
+ #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 88 |
|
| 89 |
def register(): |
| 90 |
"inform main catalyst program of the contents of this plugin" |
| 91 |
|
| 92 |
diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py |
| 93 |
index 08ba6d4..eb4470c 100644 |
| 94 |
--- a/catalyst/arch/x86.py |
| 95 |
+++ b/catalyst/arch/x86.py |
| 96 |
@@ -78,21 +78,22 @@ class arch_pentium4(generic_x86): |
| 97 |
def __init__(self,myspec): |
| 98 |
generic_x86.__init__(self,myspec) |
| 99 |
self.settings["CFLAGS"]="-O2 -march=pentium4 -pipe" |
| 100 |
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 101 |
+ #lines like this appears to be trying to set the profile default, better to use the profile |
| 102 |
+ #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 103 |
|
| 104 |
class arch_pentium_m(generic_x86): |
| 105 |
"Intel Pentium M CPU with MMX, SSE and SSE2 support" |
| 106 |
def __init__(self,myspec): |
| 107 |
generic_x86.__init__(self,myspec) |
| 108 |
self.settings["CFLAGS"]="-O2 -march=pentium-m -pipe" |
| 109 |
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 110 |
+ #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 111 |
|
| 112 |
class arch_prescott(generic_x86): |
| 113 |
"improved version of Intel Pentium 4 CPU with MMX, SSE, SSE2 and SSE3 support" |
| 114 |
def __init__(self,myspec): |
| 115 |
generic_x86.__init__(self,myspec) |
| 116 |
self.settings["CFLAGS"]="-O2 -march=prescott -pipe" |
| 117 |
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 118 |
+ #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]} |
| 119 |
self.settings["CHOST"]="i686-pc-linux-gnu" |
| 120 |
|
| 121 |
class arch_k6(generic_x86): |
Archives