ARM fixes

diff --git a/ChangeLog b/ChangeLog
index ff8e3f181384f916fc875cffbdbf6d7bde52b806..1645d8e226f250077797df4fb91199f1e75fed94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  26 Sep 2010; Raúl Porcel <armin76@gentoo.org>
+  modules/catalyst/arch/arm.py:
+  ARM fixes
+
   11 Sep 2010; Raúl Porcel <armin76@gentoo.org>
   targets/support/chroot-functions.sh:
   Apply patch to make stage2 quiet, thanks to Alexandre Nuno Milheiro

diff --git a/modules/catalyst/arch/arm.py b/modules/catalyst/arch/arm.py
index ad7a687289aa2352af92d099b49279884ba65908..774070115dc43c6cfbd6823f1918c61216ac9fd8 100644 (file)
--- a/modules/catalyst/arch/arm.py
+++ b/modules/catalyst/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=hard"
+               self.settings["CFLAGS"]+=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
 
 class arch_armv5teb(generic_armeb):
        "Builder class for armv5teb (XScale) target"
@@ -134,12 +113,9 @@ _subarch_map = {
        "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