Browse Source

Disable o32 ABI for MIPS64 architectures

Building o32 ELF files for MIPS64 is an exotic configuration that nobody
should be using. If o32 is required, then is better if it's built for
MIPS 32-bit cores so only 32-bit instructions will be used leading to a
more efficient o32 usage.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Vicente Olivert Riera 11 years ago
parent
commit
574fa145d8
2 changed files with 14 additions and 5 deletions
  1. 8 0
      CHANGES
  2. 6 5
      arch/Config.in.mips

+ 8 - 0
CHANGES

@@ -1,3 +1,11 @@
+2014.05, Not yet released:
+
+Support for MIPS o32 ABI on MIPS-64 targets has been removed. Building
+o32 ELF files for MIPS64 is an exotic configuration that nobody should
+be using. If o32 is required, then is better if it's built for MIPS
+32-bit cores so only 32-bit instructions will be used leading to a more
+efficient o32 usage.
+
 2014.02, Released February 27th, 2014
 2014.02, Released February 27th, 2014
 
 
 	Minor fixes.
 	Minor fixes.

+ 6 - 5
arch/Config.in.mips

@@ -38,15 +38,12 @@ endchoice
 
 
 choice
 choice
 	prompt "Target ABI"
 	prompt "Target ABI"
-	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
-	default BR2_MIPS_OABI32 if !BR2_ARCH_IS_64
-	default BR2_MIPS_NABI32 if BR2_ARCH_IS_64
+	depends on BR2_mips64 || BR2_mips64el
+	default BR2_MIPS_NABI32
 
 
 	help
 	help
 	  Application Binary Interface to use
 	  Application Binary Interface to use
 
 
-config BR2_MIPS_OABI32
-	bool "o32"
 config BR2_MIPS_NABI32
 config BR2_MIPS_NABI32
 	bool "n32"
 	bool "n32"
 	depends on BR2_ARCH_IS_64
 	depends on BR2_ARCH_IS_64
@@ -86,6 +83,10 @@ config BR2_GCC_TARGET_ARCH
 	default "mips64"	if BR2_mips_64
 	default "mips64"	if BR2_mips_64
 	default "mips64r2"	if BR2_mips_64r2
 	default "mips64r2"	if BR2_mips_64r2
 
 
+config BR2_MIPS_OABI32
+	bool
+	default y		if BR2_mips || BR2_mipsel
+
 config BR2_GCC_TARGET_ABI
 config BR2_GCC_TARGET_ABI
 	default "32"		if BR2_MIPS_OABI32
 	default "32"		if BR2_MIPS_OABI32
 	default "n32"		if BR2_MIPS_NABI32
 	default "n32"		if BR2_MIPS_NABI32