commit: be6d7f0b7f0a36d4bbfa30704dbccf6bd76f5754
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 17:49:38 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 17:49:38 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=be6d7f0b
use profile for CPU_FLAGS_X86 where appropriate
a number of the CPU_FLAGS_X86 settings appeared to be trying to use something
very much like the default from the profile but missing mmxext. Due to this,
a number of packages like ffmpeg would be broken, where using the profile is
better.
Modified to remove (comment out) the ones that appeared to be attempting to
use the default (and failing) while leaving in the settings which are
intentionally
disabling certain unavailable features per sub-arch.
catalyst/arch/amd64.py | 15 ++++++++-------
catalyst/arch/x86.py | 7 ++++---
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
index dccfa46..1e11be9 100644
--- a/catalyst/arch/amd64.py
+++ b/catalyst/arch/amd64.py
@@ -13,7 +13,8 @@ class arch_amd64(generic_amd64):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -pipe"
self.settings["CHOST"]="x86_64-pc-linux-gnu"
-
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+ #lines like this appears to be trying to set the profile
default, better to use the profile
+
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
class arch_nocona(generic_amd64):
"improved version of Intel Pentium 4 CPU with 64-bit extensions, MMX,
SSE, SSE2 and SSE3 support"
@@ -21,7 +22,7 @@ class arch_nocona(generic_amd64):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=nocona -pipe"
self.settings["CHOST"]="x86_64-pc-linux-gnu"
-
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
# Requires gcc 4.3 to use this class
class arch_core2(generic_amd64):
@@ -30,7 +31,7 @@ class arch_core2(generic_amd64):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=core2 -pipe"
self.settings["CHOST"]="x86_64-pc-linux-gnu"
-
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","ssse3"]}
+
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","ssse3"]}
class arch_k8(generic_amd64):
"generic k8, opteron and athlon64 support"
@@ -38,7 +39,7 @@ class arch_k8(generic_amd64):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=k8 -pipe"
self.settings["CHOST"]="x86_64-pc-linux-gnu"
-
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
+
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
class arch_k8_sse3(generic_amd64):
"improved versions of k8, opteron and athlon64 with SSE3 support"
@@ -46,7 +47,7 @@ class arch_k8_sse3(generic_amd64):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=k8-sse3 -pipe"
self.settings["CHOST"]="x86_64-pc-linux-gnu"
-
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
+
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
class arch_amdfam10(generic_amd64):
"AMD Family 10h core based CPUs with x86-64 instruction set support"
@@ -54,7 +55,7 @@ class arch_amdfam10(generic_amd64):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=amdfam10 -pipe"
self.settings["CHOST"]="x86_64-pc-linux-gnu"
-
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
+
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
class arch_x32(generic_amd64):
"builder class for generic x32 (Intel and AMD)"
@@ -62,7 +63,7 @@ class arch_x32(generic_amd64):
generic_amd64.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -pipe"
self.settings["CHOST"]="x86_64-pc-linux-gnux32"
-
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
def register():
"inform main catalyst program of the contents of this plugin"
diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index 08ba6d4..eb4470c 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -78,21 +78,22 @@ class arch_pentium4(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=pentium4 -pipe"
-
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+ #lines like this appears to be trying to set the profile
default, better to use the profile
+
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
class arch_pentium_m(generic_x86):
"Intel Pentium M CPU with MMX, SSE and SSE2 support"
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=pentium-m -pipe"
-
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
class arch_prescott(generic_x86):
"improved version of Intel Pentium 4 CPU with MMX, SSE, SSE2 and SSE3
support"
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["CFLAGS"]="-O2 -march=prescott -pipe"
-
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+
#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
self.settings["CHOST"]="i686-pc-linux-gnu"
class arch_k6(generic_x86):
