From a5f73ecfc3b194ab38c3f5f5b0f88d1336296ae2 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 4 Apr 2009 17:16:20 -0500 Subject: [PATCH] Apply additional patch from gentoo bug #255793 for arm subarches --- ChangeLog | 4 +++ modules/catalyst/arch/arm.py | 66 +++++++++++++++++++++++++++++++++--- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02279885..b4710863 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 04 Apr 2009; Andrew Gaffney + modules/catalyst/arch/arm.py: + Apply additional patch from gentoo bug #255793 for arm subarches + 04 Apr 2009; Andrew Gaffney targets/support/chroot-functions.sh: Apply patch from gentoo bug #264457 to prevent deleting of ccache cache diff --git a/modules/catalyst/arch/arm.py b/modules/catalyst/arch/arm.py index 87b6c5ec..239cf576 100644 --- a/modules/catalyst/arch/arm.py +++ b/modules/catalyst/arch/arm.py @@ -6,20 +6,21 @@ class generic_arm(catalyst.arch.generic_arch): def __init__(self,myspec): catalyst.arch.generic_arch.__init__(self,myspec) self.settings["CHROOT"]="chroot" - self.settings["CFLAGS"]="-O2 -pipe" + self.settings["CFLAGS"]="-Os -pipe" class generic_armeb(catalyst.arch.generic_arch): "Abstract base class for all arm (big endian) builders" def __init__(self,myspec): catalyst.arch.generic_arch.__init__(self,myspec) self.settings["CHROOT"]="chroot" - self.settings["CFLAGS"]="-O2 -pipe" + self.settings["CFLAGS"]="-Os -pipe" class arch_arm(generic_arm): "Builder class for arm (little endian) target" def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="arm-unknown-linux-gnu" + self.settings["CFLAGS"]="-Os -march=armv4 -pipe" class arch_armeb(generic_armeb): "Builder class for arm (big endian) target" @@ -32,54 +33,105 @@ class arch_armv4l(generic_arm): def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="armv4l-unknown-linux-gnu" + self.settings["CFLAGS"]="-Os -march=armv4 -pipe" class arch_armv4tl(generic_arm): "Builder class for armv4tl target" def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="armv4tl-softfloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv4t -pipe" class arch_armv5l(generic_arm): "Builder class for armv5l target" def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="armv5l-softfloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv5 -pipe" class arch_armv5tl(generic_arm): "Builder class for armv5tl target" def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="armv5tl-softfloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv5t -pipe" class arch_armv5tel(generic_arm): "Builder class for armv5tel target" def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="armv5tel-softfloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv5te -pipe" class arch_armv5tejl(generic_arm): "Builder class for armv5tejl target" def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="armv5tejl-softfloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv5te -pipe" class arch_armv6l(generic_arm): "Builder class for armv6l target" def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="armv6l-softloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv6 -pipe" + +class arch_armv6jl(generic_arm): + "Builder class for armv6jl target" + def __init__(self,myspec): + generic_arm.__init__(self,myspec) + self.settings["CHOST"]="armv6jl-softloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv6j -pipe" + +class arch_armv6t2l(generic_arm): + "Builder class for armv6t2l target" + def __init__(self,myspec): + generic_arm.__init__(self,myspec) + self.settings["CHOST"]="armv6t2l-softloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv6t2 -pipe" + +class arch_armv6zl(generic_arm): + "Builder class for armv6zl target" + def __init__(self,myspec): + generic_arm.__init__(self,myspec) + self.settings["CHOST"]="armv6zl-softloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv6z -pipe" + +class arch_armv6zkl(generic_arm): + "Builder class for armv6zkl target" + def __init__(self,myspec): + generic_arm.__init__(self,myspec) + self.settings["CHOST"]="armv6zkl-softloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv6zk -pipe" class arch_armv7l(generic_arm): "Builder class for armv7l target" def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="armv7l-softfloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv7 -pipe" -class arch_armv7al(generic_armeb): +class arch_armv7al(generic_arm): "Builder class for armv7al target" def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="armv7al-softfloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv7-a -pipe" + +class arch_armv7rl(generic_arm): + "Builder class for armv7rl target" + def __init__(self,myspec): + generic_arm.__init__(self,myspec) + self.settings["CHOST"]="armv7ml-softfloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv7-r -pipe" + +class arch_armv7ml(generic_arm): + "Builder class for armv7ml target" + def __init__(self,myspec): + generic_arm.__init__(self,myspec) + self.settings["CHOST"]="armv7ml-softfloat-linux-gnueabi" + self.settings["CFLAGS"]="-Os -march=armv7-m -pipe" class arch_armv5teb(generic_armeb): "Builder class for armv5teb (XScale) target" @@ -97,10 +149,16 @@ _subarch_map = { "armv5tel": arch_armv5tel, "armv5tejl": arch_armv5tejl, "armv6l" : arch_armv6l, + "armv6jl" : arch_armv6jl, + "armv6t2l" : arch_armv6t2l, + "armv6zl" : arch_armv6zl, + "armv6zkl" : arch_armv6zkl, "armv7l" : arch_armv7l, "armv7al" : arch_armv7al, + "armv7rl" : arch_armv7rl, + "armv7ml" : arch_armv7ml, "armeb" : arch_armeb, "armv5b" : arch_armv5b } -_machine_map = ("arm", "armv4l", "armv4tl", "armv5l", "armv5tl", "armv5tel", "armv5tejl", "armv6l", "armv7l", "armv7al", "armeb", "armv5teb") +_machine_map = ("arm", "armv4l", "armv4tl", "armv5l", "armv5tl", "armv5tel", "armv5tejl", "armv6l", "armv7l", "armeb", "armv5teb") -- 2.26.2