[Buildroot] [PATCH 1/2] gcc: fix HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI typos

[Buildroot] [PATCH 1/2] gcc: fix HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI typos

[Thomas Petazzoni]

The HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI variable was incorrectly
used as HOST_GCC_COMMON_WRAPPER_TARGET_FLOATABI_, which would always
be empty.

In practice, this block of code is only used on Blackfin (which has
BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS unset) and Blackfin doesn't use
float-abi, so this block of code is in fact useless. But even if it's
useless, it's better to have it without typos.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/gcc/gcc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index f42f36a967..5a1e3d5b0c 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -297,8 +297,8 @@ endif
 ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FPU),)
 HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FPU='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FPU)"'
 endif
-ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FLOATABI_),)
-HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FLOATABI_)"'
+ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI),)
+HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI)"'
 endif
 ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_MODE),)
 HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_MODE='"$(HOST_GCC_COMMON_WRAPPER_TARGET_MODE)"'
-- 
2.14.3

[Buildroot] [PATCH 2/2] uclibc: simplify UCLIBC_EXTRA_CFLAGS

[Thomas Petazzoni]

Since commit f66952197b41452b77dfa065adc7172137e4c243 ("package/gcc:
remove gcc 4.8"), UCLIBC_EXTRA_CFLAGS no longer exists, and is
therefore always empty.

Passing the Buildroot make variable UCLIBC_EXTRA_CFLAGS into the
UCLIBC_EXTRA_CFLAGS fed into uClibc's make environment therefore no
longer makes sense. Therefore, just pass $(TARGET_ABI).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/uclibc/uclibc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 8d198f669a..25e86534fd 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -382,7 +382,7 @@ endif
 UCLIBC_MAKE_FLAGS = \
 	ARCH="$(UCLIBC_TARGET_ARCH)" \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
-	UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS) $(TARGET_ABI)" \
+	UCLIBC_EXTRA_CFLAGS="$(TARGET_ABI)" \
 	HOSTCC="$(HOSTCC)"
 
 define UCLIBC_KCONFIG_FIXUP_CMDS
-- 
2.14.3

[Buildroot] [PATCH 1/2] gcc: fix HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI typos

[Thomas Petazzoni]

Hello,

On Wed,  4 Apr 2018 17:54:50 +0200, Thomas Petazzoni wrote:
> The HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI variable was incorrectly
> used as HOST_GCC_COMMON_WRAPPER_TARGET_FLOATABI_, which would always
> be empty.
> 
> In practice, this block of code is only used on Blackfin (which has
> BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS unset) and Blackfin doesn't use
> float-abi, so this block of code is in fact useless. But even if it's
> useless, it's better to have it without typos.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  package/gcc/gcc.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Both patches applied.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com