Skip to contentSkip to conversation

package/libunwind: simplify architectutre dependencies

PATCH New Yann E. MORIN 3 participants 3 messages Apr 17, 2017 – May 4, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libunwind: simplify architectutre dependencies

BR2_ARM_CPU_HAS_ARM already embeddeds the fact that this is an ARM chip, so (BR2_arm || BR2_armeb) is forcibly true when BR2_ARM_CPU_HAS_ARM is.

In other words, BR2_ARM_CPU_HAS_ARM can't be true unless either BR2_arm or BR2_armeb itslef is true.

Simplify the logic accordingly.

---
 package/libunwind/Config.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
package/libunwind/Config.in +3 -6
index 9007ce51c2..2003e96518 100644
@@ -10,16 +10,13 @@
 config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
 	bool
 	default y if BR2_TOOLCHAIN_USES_GLIBC && \
-		(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
-		 BR2_mips || BR2_mipsel || BR2_mips64 || \
+		(BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || BR2_mips64 || \
 		 BR2_mips64el || BR2_powerpc || BR2_sh || BR2_i386 || BR2_x86_64)
 	default y if BR2_TOOLCHAIN_USES_UCLIBC && \
-		(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
-		 BR2_mips || BR2_mipsel || \
+		(BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || \
 		 BR2_mips64 || BR2_mips64el || BR2_x86_64)
 	default y if BR2_TOOLCHAIN_USES_MUSL && \
-		(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
-		 BR2_i386 || BR2_x86_64)
+		(BR2_ARM_CPU_HAS_ARM || BR2_i386 || BR2_x86_64)
 
 config BR2_PACKAGE_LIBUNWIND
 	bool "libunwind"
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/libunwind: simplify architectutre dependencies

Hi Yann, All,

Le 17/04/2017 ? 18:44, Yann E. MORIN a ?crit :

Quoted 7 lines

BR2_ARM_CPU_HAS_ARM already embeddeds the fact that this is an ARM chip, so (BR2_arm || BR2_armeb) is forcibly true when BR2_ARM_CPU_HAS_ARM is.

In other words, BR2_ARM_CPU_HAS_ARM can't be true unless either BR2_arm or BR2_armeb itslef is true.

Simplify the logic accordingly.

The same simplification can be done in package/boost/Config.in.

Best regards,
Romain

Quoted 32 lines
---
 package/libunwind/Config.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
package/libunwind/Config.in +3 -6
index 9007ce51c2..2003e96518 100644
@@ -10,16 +10,13 @@
 config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
 	bool
 	default y if BR2_TOOLCHAIN_USES_GLIBC && \
-		(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
-		 BR2_mips || BR2_mipsel || BR2_mips64 || \
+		(BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || BR2_mips64 || \
 		 BR2_mips64el || BR2_powerpc || BR2_sh || BR2_i386 || BR2_x86_64)
 	default y if BR2_TOOLCHAIN_USES_UCLIBC && \
-		(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
-		 BR2_mips || BR2_mipsel || \
+		(BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || \
 		 BR2_mips64 || BR2_mips64el || BR2_x86_64)
 	default y if BR2_TOOLCHAIN_USES_MUSL && \
-		(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
-		 BR2_i386 || BR2_x86_64)
+		(BR2_ARM_CPU_HAS_ARM || BR2_i386 || BR2_x86_64)
 
 config BR2_PACKAGE_LIBUNWIND
 	bool "libunwind"
#2 lore raw

PATCH 1/1 package/libunwind: simplify architectutre dependencies

In reply to Yann E. MORIN

Hello,

Quoted 6 lines · Yann E. MORIN

BR2_ARM_CPU_HAS_ARM already embeddeds the fact that this is an ARM chip, so (BR2_arm || BR2_armeb) is forcibly true when BR2_ARM_CPU_HAS_ARM is.

In other words, BR2_ARM_CPU_HAS_ARM can't be true unless either BR2_arm or BR2_armeb itslef is true.

Quoted 7 lines

Simplify the logic accordingly.

---
 package/libunwind/Config.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Applied to master, after fixing the typo in the commit title. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com