Skip to contentSkip to conversation

gcc: fix HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI typos

PATCH New Thomas Petazzoni 1 participant 3 messages Apr 4, 2018 – Apr 9, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gcc: fix HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI typos

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.

---
 package/gcc/gcc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/gcc/gcc.mk +2 -2
index f42f36a967..5a1e3d5b0c 100644
@@ -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)"'
Signature · 1 line
2.14.3
#1 lore raw

PATCH 1/2 gcc: fix HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI typos

Hello,

Quoted 9 lines · 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.

Quoted 4 lines
---
 package/gcc/gcc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Both patches applied.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 2/2 uclibc: simplify UCLIBC_EXTRA_CFLAGS

In reply to 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).

---
 package/uclibc/uclibc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/uclibc/uclibc.mk +1 -1
index 8d198f669a..25e86534fd 100644
@@ -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
Signature · 1 line
2.14.3