Apply additional patch from gentoo bug #255793 for arm subarches

1 files changed, 62 insertions, 4 deletions

diff --git a/arch/arm.py b/arch/arm.py
index aa6e616a..93eb7575 100644
--- a/arch/arm.py
+++ b/arch/arm.py
@@ -7,14 +7,14 @@ class generic_arm(builder.generic):
 	def __init__(self,myspec):
 		builder.generic.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
-		self.settings["CFLAGS"]="-O2 -pipe"
+		self.settings["CFLAGS"]="-Os -pipe"
    
 class generic_armeb(builder.generic):
 	"Abstract base class for all arm (big endian) builders"
 	def __init__(self,myspec):
 		builder.generic.__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"
@@ -33,54 +33,106 @@ 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"
@@ -100,10 +152,16 @@ def register():
 		"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,
 		"armv5teb" : arch_armv5teb
 	}, ("arm", "armv4l", "armv4tl", "armv5l", "armv5tl", "armv5tel", "armv5tejl", "armv6l", 
-"armv7l", "armv7al", "armeb", "armv5teb") )
+"armv7l", "armeb", "armv5teb") )