[Buildroot] [pull request] Pull request for branch yem-no-arm-oabi

[Buildroot] [pull request] Pull request for branch yem-no-arm-oabi

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Hello All!

This series finally gets rid of the legacy ARM OABI support.
The series is split in four steps:

  - Patch 2 makes OABI un-selectable by entirely removing the
    symbol from the Kconfig options
  - Patches 3-5 remove all code called when OABI is set
  - Patches 6-11 remove all code conditional on EABI, and make
    it unconditional, since EABI is all we support now
  - Patch 11 finally gets rid of the EABI symbol altogether.

As a bonus, patch 1 is a trivial indentation fix (use tabs, not spaces).

As discussed with Thomas on IRC, this will most probably come
clashing with his own hard-float related series.

Regards,
Yann E. MORIN.


The following changes since commit 7cbebbc48c26ddfb18da23ffba356744a5592ea6:

  Add 'bc' in the mandatory dependencies (2013-07-05 15:30:43 +0200)

are available in the git repository at:

  git://gitorious.org/buildroot/buildroot.git yem-no-arm-oabi

for you to fetch changes up to 95403113defe7a6c8f713a3e2ba0c85ca1e6df3b:

  arch/arm: remove ARM_EABI symbol since there's no users left (2013-07-06 22:40:11 +0200)

----------------------------------------------------------------
Yann E. MORIN (12):
      package/uclibc: fix indentation (use tabs, not spaces)
      arch/arm: remove OABI option
      arch/arm: remove setting gcc's apcs-gnu ABI (aka OABI)
      package/uclibc: ARM OABI is no longer supported
      toolchain/helpers: ARM OABI is no longer supported
      arch/arm: drop 'if EABI' since it's always true now
      linux: remove EABI conditional
      pkg-infra: dump all ARM OABI references when setting ABI
      toolchain/helpers: only check for an EABI toolchain
      package/owl-linux: drop check for EABI
      package/uClibc: drop ARM EABI conditions
      arch/arm: remove ARM_EABI symbol since there's no users left

 arch/Config.in.arm          | 25 +------------------------
 linux/linux.mk              |  5 ++---
 package/Makefile.in         |  9 ++++-----
 package/owl-linux/Config.in |  5 ++---
 package/uclibc/Config.in    | 11 ++---------
 package/uclibc/uclibc.mk    |  4 +---
 toolchain/helpers.mk        | 13 ++-----------
 7 files changed, 14 insertions(+), 58 deletions(-)

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 01/12] package/uclibc: fix indentation (use tabs, not spaces)

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/uclibc/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index f309243..e508342 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -113,7 +113,7 @@ choice
 
 	config BR2_PTHREADS_NATIVE
 		bool "Native POSIX Threading (NPTL)"
-	        select BR2_TOOLCHAIN_HAS_THREADS
+		select BR2_TOOLCHAIN_HAS_THREADS
 		depends on !BR2_ARM_OABI
 		depends on !BR2_x86_i386
 		depends on !BR2_avr32
-- 
1.8.1.2

[Buildroot] [PATCH 02/12] arch/arm: remove OABI option

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

OABI is more than legacy, it's dead.

New developments should go with EABI, since it so much better.
From the Debian EABI page [0] :
  - floating point performance, with or without an FPU is very much faster
  - mixing soft and hardfloat code is possible
  - structure packing is not as painful as it used to be
  - a more efficient syscall convention
  - more compatibility with various tools

[0] http://wiki.debian.org/ArmEabiPort

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/Config.in.arm | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 983cac4..45d2b4b 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -64,27 +64,8 @@ config BR2_arm1136jf_s
 	bool
 	default BR2_arm1136jf_s_r0 || BR2_arm1136jf_s_r1
 
-choice
-	prompt "Target ABI"
-	depends on BR2_arm || BR2_armeb
-	depends on BR2_DEPRECATED
-	default BR2_ARM_EABI
-	help
-	  Application Binary Interface to use
-
-	  Note:
-	    Using OABI is discouraged.
-
-config BR2_ARM_EABI_CHOICE
-	bool "EABI"
-config BR2_ARM_OABI
-	bool "OABI"
-	depends on !BR2_GCC_VERSION_4_7_X
-endchoice
-
 config BR2_ARM_EABI
 	def_bool y
-	depends on !BR2_ARM_OABI
 
 config BR2_ARM_ENABLE_NEON
 	bool "Enable NEON SIMD extension support"
-- 
1.8.1.2

[Buildroot] [PATCH 03/12] arch/arm: remove setting gcc's apcs-gnu ABI (aka OABI)

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 arch/Config.in.arm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 45d2b4b..1fc0bd7 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -130,5 +130,4 @@ config BR2_GCC_TARGET_ARCH
 	default "iwmmxt"	if BR2_iwmmxt
 
 config BR2_GCC_TARGET_ABI
-	default "apcs-gnu"	if BR2_ARM_OABI
 	default "aapcs-linux"	if BR2_ARM_EABI
-- 
1.8.1.2

[Buildroot] [PATCH 04/12] package/uclibc: ARM OABI is no longer supported

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/uclibc/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index e508342..b9917a7 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -90,7 +90,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LOCALE
 
 choice
 	prompt "Thread library implementation"
-	default BR2_PTHREADS_NATIVE if !BR2_ARM_OABI && !(BR2_avr32 || BR2_xtensa)
+	default BR2_PTHREADS_NATIVE if !(BR2_avr32 || BR2_xtensa)
 	default BR2_PTHREADS_OLD
 	help
 	  Use this option to select the thread library implementation
@@ -114,7 +114,6 @@ choice
 	config BR2_PTHREADS_NATIVE
 		bool "Native POSIX Threading (NPTL)"
 		select BR2_TOOLCHAIN_HAS_THREADS
-		depends on !BR2_ARM_OABI
 		depends on !BR2_x86_i386
 		depends on !BR2_avr32
 		depends on !BR2_xtensa
@@ -186,7 +185,6 @@ config BR2_UCLIBC_ARM_TYPE
 config BR2_UCLIBC_ARM_ABI
 	string
 	depends on BR2_UCLIBC_TARGET_ARCH = "arm"
-	default OABI if BR2_ARM_OABI
 	default EABI if BR2_ARM_EABI
 
 config BR2_UCLIBC_ARM_BX
-- 
1.8.1.2

[Buildroot] [PATCH 05/12] toolchain/helpers: ARM OABI is no longer supported

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 toolchain/helpers.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 1509ff8..0398b63 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -285,10 +285,6 @@ check_arm_abi = \
 	else \
 		EXT_TOOLCHAIN_ABI="oabi" ; \
 	fi ; \
-	if [ x$(BR2_ARM_OABI) = x"y" -a $${EXT_TOOLCHAIN_ABI} = "eabi" ] ; then \
-		echo "Incorrect ABI setting" ; \
-		exit 1 ; \
-	fi ; \
 	if [ x$(BR2_ARM_EABI) = x"y" -a $${EXT_TOOLCHAIN_ABI} = "oabi" ] ; then \
 		echo "Incorrect ABI setting" ; \
 		exit 1 ; \
-- 
1.8.1.2

[Buildroot] [PATCH 06/12] arch/arm: drop 'if EABI' since it's always true now

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/Config.in.arm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 1fc0bd7..8399a8c 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -130,4 +130,4 @@ config BR2_GCC_TARGET_ARCH
 	default "iwmmxt"	if BR2_iwmmxt
 
 config BR2_GCC_TARGET_ABI
-	default "aapcs-linux"	if BR2_ARM_EABI
+	default "aapcs-linux"
-- 
1.8.1.2

[Buildroot] [PATCH 07/12] linux: remove EABI conditional

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

We're only EABI now, so we want to always build an EABI kernel
when we're building for ARM.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 linux/linux.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index befef16..5ccd205 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -170,9 +170,8 @@ define LINUX_CONFIGURE_CMDS
 	cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
 	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
 	rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
-	$(if $(BR2_ARM_EABI),
-		$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config),
-		$(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config))
+	$(if $(BR2_arm)$(BR2_armeb),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config))
 	# As the kernel gets compiled before root filesystems are
 	# built, we create a fake cpio file. It'll be
 	# replaced later by the real cpio archive, and the kernel will be
-- 
1.8.1.2

[Buildroot] [PATCH 08/12] pkg-infra: dump all ARM OABI references when setting ABI

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Makefile.in | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 405b3e4..06db122 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -30,11 +30,10 @@ LIBC=gnu
 endif
 
 # The ABI suffix is a bit special on ARM, as it needs to be
-# -uclibcgnueabi for uClibc EABI, -uclibc for uClibc OABI, -gnueabi
-# for glibc EABI and -gnu for glibc OABI. This means that the LIBC and
-# ABI aren't strictly orthogonal, which explains why we need the test
-# on LIBC below.
-ifeq ($(BR2_ARM_EABI),y)
+# -uclibcgnueabi for uClibc EABI, and -gnueabi for glibc EABI.
+# This means that the LIBC and ABI aren't strictly orthogonal,
+# which explains why we need the test on LIBC below.
+ifeq ($(BR2_arm)$(BR2_armeb),y)
 ifeq ($(LIBC),uclibc)
 ABI=gnueabi
 else
-- 
1.8.1.2

[Buildroot] [PATCH 09/12] toolchain/helpers: only check for an EABI toolchain

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

... since we only support EABI now.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/helpers.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 0398b63..95217e7 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -280,13 +280,8 @@ check_uclibc = \
 check_arm_abi = \
 	__CROSS_CC=$(strip $1) ; \
 	EXT_TOOLCHAIN_TARGET=`LANG=C $${__CROSS_CC} -v 2>&1 | grep ^Target | cut -f2 -d ' '` ; \
-	if echo $${EXT_TOOLCHAIN_TARGET} | grep -qE 'eabi(hf)?$$' ; then \
-		EXT_TOOLCHAIN_ABI="eabi" ; \
-	else \
-		EXT_TOOLCHAIN_ABI="oabi" ; \
-	fi ; \
-	if [ x$(BR2_ARM_EABI) = x"y" -a $${EXT_TOOLCHAIN_ABI} = "oabi" ] ; then \
-		echo "Incorrect ABI setting" ; \
+	if ! echo $${EXT_TOOLCHAIN_TARGET} | grep -qE 'eabi(hf)?$$' ; then \
+		echo "External toolchain uses the unsuported OABI" ; \
 		exit 1 ; \
 	fi
 
-- 
1.8.1.2

[Buildroot] [PATCH 10/12] package/owl-linux: drop check for EABI

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

... since we only support EABI now.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/owl-linux/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/owl-linux/Config.in b/package/owl-linux/Config.in
index 1dcf5f1..9b14027 100644
--- a/package/owl-linux/Config.in
+++ b/package/owl-linux/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_OWL_LINUX
 	bool "owl-linux"
 	depends on BR2_LINUX_KERNEL
 	depends on (BR2_arm920t || BR2_arm922t || BR2_arm926t)
-	depends on BR2_ARM_EABI
 	help
 	  Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP.
 
@@ -14,6 +13,6 @@ comment "owl-linux requires a Linux kernel"
 	depends on !BR2_LINUX_KERNEL
 	depends on BR2_arm || BR2_armeb
 
-comment "owl-linux is only supported on ARM9 architecture with EABI"
-	depends on !(BR2_arm920t || BR2_arm922t || BR2_arm926t) || !BR2_ARM_EABI
+comment "owl-linux is only supported on ARM9 architecture"
+	depends on !(BR2_arm920t || BR2_arm922t || BR2_arm926t)
 	depends on BR2_arm || BR2_armeb
-- 
1.8.1.2

[Buildroot] [PATCH 11/12] package/uClibc: drop ARM EABI conditions

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

... since we now only support EABI for ARM, we only need to
force EABI unconditionally.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/uclibc/Config.in | 5 -----
 package/uclibc/uclibc.mk | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index b9917a7..8d16e8c 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -182,11 +182,6 @@ config BR2_UCLIBC_ARM_TYPE
 	default ARM_CORTEXA8	if BR2_cortex_a8
 	default ARM_CORTEXA9	if BR2_cortex_a9
 
-config BR2_UCLIBC_ARM_ABI
-	string
-	depends on BR2_UCLIBC_TARGET_ARCH = "arm"
-	default EABI if BR2_ARM_EABI
-
 config BR2_UCLIBC_ARM_BX
 	bool
 	depends on BR2_UCLIBC_TARGET_ARCH = "arm"
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 421e323..8eca5fe 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -69,11 +69,9 @@ define UCLIBC_ARM_TYPE_CONFIG
 	$(call UCLIBC_OPT_SET,$(UCLIBC_ARM_TYPE),y,$(@D))
 endef
 
-UCLIBC_ARM_ABI = CONFIG_ARM_$(call qstrip,$(BR2_UCLIBC_ARM_ABI))
-
 define UCLIBC_ARM_ABI_CONFIG
 	$(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config
-	$(call UCLIBC_OPT_SET,$(UCLIBC_ARM_ABI),y,$(@D))
+	$(call UCLIBC_OPT_SET,CONFIG_ARM_EABI,y,$(@D))
 endef
 
 ifeq ($(BR2_UCLIBC_ARM_BX),y)
-- 
1.8.1.2

[Buildroot] [PATCH 12/12] arch/arm: remove ARM_EABI symbol since there's no users left

[Yann E. MORIN]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/Config.in.arm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 8399a8c..39406fa 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -64,9 +64,6 @@ config BR2_arm1136jf_s
 	bool
 	default BR2_arm1136jf_s_r0 || BR2_arm1136jf_s_r1
 
-config BR2_ARM_EABI
-	def_bool y
-
 config BR2_ARM_ENABLE_NEON
 	bool "Enable NEON SIMD extension support"
 	depends on BR2_ARM_CPU_MAYBE_HAS_NEON
-- 
1.8.1.2

[Buildroot] [pull request] Pull request for branch yem-no-arm-oabi

[Thomas Petazzoni]

Yann,

On Sat,  6 Jul 2013 22:48:39 +0200, Yann E. MORIN wrote:

> This series finally gets rid of the legacy ARM OABI support.
> The series is split in four steps:
> 
>   - Patch 2 makes OABI un-selectable by entirely removing the
>     symbol from the Kconfig options
>   - Patches 3-5 remove all code called when OABI is set
>   - Patches 6-11 remove all code conditional on EABI, and make
>     it unconditional, since EABI is all we support now
>   - Patch 11 finally gets rid of the EABI symbol altogether.
> 
> As a bonus, patch 1 is a trivial indentation fix (use tabs, not spaces).
> 
> As discussed with Thomas on IRC, this will most probably come
> clashing with his own hard-float related series.

As we further discussed, I will take your patch series, put it at the
beginning of mine (with some necessary adjustments), will rebase my
work on top of it, and resend the whole thing.

Thanks!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [pull request] Pull request for branch yem-no-arm-oabi

[Yann E. MORIN]

Thomas, All,

On 2013-07-07 15:09 +0200, Thomas Petazzoni spake thusly:
> On Sat,  6 Jul 2013 22:48:39 +0200, Yann E. MORIN wrote:
> > This series finally gets rid of the legacy ARM OABI support.
> > The series is split in four steps:
[--SNIP--]
> As we further discussed, I will take your patch series, put it at the
> beginning of mine (with some necessary adjustments), will rebase my
> work on top of it, and resend the whole thing.

Ok, thank you! :-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'