From a0fcd03943c36fe6c4ebd69f928f8a9d0bec9c75 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 8 Feb 2008 00:10:10 +0000 Subject: [PATCH] Fixing a minor display issue when we write out make.conf, adding HOSTUSE for amd64 to add mmx, sse, and sse2 to USE, adding sse2 to pentium4's HOSTUSE. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1287 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ arch/amd64.py | 1 + arch/x86.py | 7 +++---- modules/generic_stage_target.py | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09ee7859..2b259688 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 08 Feb 2008; Chris Gianelloni arch/amd64.py, + arch/x86.py, modules/generic_stage_target.py: + Fixing a minor display issue when we write out make.conf, adding HOSTUSE for + amd64 to add mmx, sse, and sse2 to USE, adding sse2 to pentium4's HOSTUSE. + 07 Feb 2008; Andrew Gaffney targets/support/kmerge.sh: Make the --kerncache option to genkernel dependent on 'kerncache' being in diff --git a/arch/amd64.py b/arch/amd64.py index 5cfa2eae..2ede817e 100644 --- a/arch/amd64.py +++ b/arch/amd64.py @@ -13,6 +13,7 @@ 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["HOSTUSE"]=["mmx","sse","sse2"] #class arch_nocona(generic_x86): # def __init__(self,myspec): diff --git a/arch/x86.py b/arch/x86.py index 6592f9eb..23f7d190 100644 --- a/arch/x86.py +++ b/arch/x86.py @@ -81,7 +81,7 @@ class arch_pentium4(generic_x86): def __init__(self,myspec): arch_i686.__init__(self,myspec) self.settings["CFLAGS"]="-O2 -march=pentium4 -pipe" - self.settings["HOSTUSE"]=["mmx","sse"] + self.settings["HOSTUSE"]=["mmx","sse","sse2"] class arch_prescott(generic_x86): def __init__(self,myspec): @@ -100,11 +100,10 @@ def register(): "athlon" : arch_athlon, "athlon-xp" : arch_athlon_xp, "athlon-mp" : arch_athlon_xp, - "pentium-mmx" : arch_pentium_mmx, + "pentium-mmx" : arch_pentium_mmx, "pentium2" : arch_pentium2, "pentium3" : arch_pentium3, "pentium4" : arch_pentium4, "prescott" : arch_prescott - }, - ('i386', 'i486', 'i586', 'i686')) + }, ('i386', 'i486', 'i586', 'i686')) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 03aeb0a1..a51abde4 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -908,7 +908,7 @@ class generic_stage_target(generic_target): myf.write("# This should not be changed unless you know exactly what you are doing. You\n# should probably be using a different stage, instead.\n") if self.settings.has_key("CBUILD"): myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n') - myf.write('# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing it.\nCHOST="'+self.settings["CHOST"]+'"\n') + myf.write('# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.\nCHOST="'+self.settings["CHOST"]+'"\n') # Figure out what our USE vars are for building myusevars=[] -- 2.26.2