ARM fixes

diff --git a/ChangeLog b/ChangeLog
index 66c6d229d0f198b9bbb4355986a5588b3a55763c..1b91de313993aa49e2e7c67e84c691acee02a93e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  26 Sep 2010; Raúl Porcel <armin76@gentoo.org> arch/arm.py:
+  Arm fixes
+
   11 Sep 2010; Raúl Porcel <armin76@gentoo.org> catalyst:
   This is catalyst-2.0.6.909
 

diff --git a/arch/arm.py b/arch/arm.py
index 2334f8d916a94c573ca5c6488816bcc3f5eb12db..9f840eb882f2bf46b0b4edeb37ddd32068b09c95 100644 (file)
--- a/arch/arm.py
+++ b/arch/arm.py
@@ -70,13 +70,6 @@ class arch_armv6j(generic_arm):
                self.settings["CHOST"]="armv6j-unknown-linux-gnueabi"
                self.settings["CFLAGS"]+=" -march=armv6j -mfpu=vfp -mfloat-abi=softfp"
 
-class arch_armv6t2(generic_arm):
-       "Builder class for armv6t2 target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv6t2-unknown-linux-gnueabi"
-               self.settings["CFLAGS"]=" -march=armv6t2 -mfpu=vfp -mfloat-abi=softfp"
-
 class arch_armv6z(generic_arm):
        "Builder class for armv6z target"
        def __init__(self,myspec):
@@ -96,28 +89,14 @@ class arch_armv7a(generic_arm):
        def __init__(self,myspec):
                generic_arm.__init__(self,myspec)
                self.settings["CHOST"]="armv7a-unknown-linux-gnueabi"
-               self.settings["CFLAGS"]+=" -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
-
-class arch_armv7r(generic_arm):
-       "Builder class for armv7r target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv7r-unknown-linux-gnueabi"
-               self.settings["CFLAGS"]+=" -march=armv7-r -mfpu=vfp -mfloat-abi=softfp"
-
-class arch_armv7m(generic_arm):
-       "Builder class for armv7m target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv7m-unknown-linux-gnueabi"
-               self.settings["CFLAGS"]+=" -march=armv7-m -mfpu=vfp -mfloat-abi=softfp"
+               self.settings["CFLAGS"]+=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
 
 class arch_armv7a_hardfp(generic_arm):
        "Builder class for armv7a hardfloat target, needs >=gcc-4.5"
        def __init__(self,myspec):
                generic_arm.__init__(self,myspec)
                self.settings["CHOST"]="armv7a-hardfloat-linux-gnueabi"
-               self.settings["CFLAGS"]+=" -march=armv7-a -mfpu=vfp -mfloat-abi=hardfp"
+               self.settings["CFLAGS"]+=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hardfp"
 
 class arch_armv5teb(generic_armeb):
        "Builder class for armv5teb (XScale) target"
@@ -136,12 +115,9 @@ def register():
                "armv5tel": arch_armv5tel,
                "armv5tejl": arch_armv5tejl,
                "armv6j" : arch_armv6j,
-               "armv6t2" : arch_armv6t2,
                "armv6z" : arch_armv6z,
                "armv6zk" : arch_armv6zk,
                "armv7a" : arch_armv7a,
-               "armv7r" : arch_armv7r,
-               "armv7m" : arch_armv7m,
                "armv7a_hardfp" : arch_armv7a_hardfp,
                "armeb"  : arch_armeb,
                "armv5teb" : arch_armv5teb

diff --git a/catalyst b/catalyst
index f323ad58bf3e04250212e23205722f7ab228453e..e9f93dd7966b1647a6f81632a319a52631198a17 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -17,7 +17,7 @@ import catalyst.config
 import catalyst.util
 
 __maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.6.909"
+__version__="2.0.6.910"
 
 conf_values={}