From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 8 May 2017 19:45:48 +0000 (+0200)
Subject: mpir: fix build on ARM Thumb-only platforms
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fa3fbeb1bf4b0d3bed85bbeab4bd0f7b1c13e21a;p=buildroot.git

mpir: fix build on ARM Thumb-only platforms

The optimized ARM assembly code is not suitable for Thumb-only
platforms, so use the generic code in such situations.

Fixes:

  http://autobuild.buildroot.net/results/4d7f2a1326f75e11693bdd51ad274079b0dd0ce4/
  (ARM Cortex-M4 toolchain)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/mpir/mpir.mk b/package/mpir/mpir.mk
index b7f3829007..cf17502358 100644
--- a/package/mpir/mpir.mk
+++ b/package/mpir/mpir.mk
@@ -20,4 +20,10 @@ ifeq ($(BR2_MIPS_NABI64),y)
 MPIR_CONF_OPTS += ABI=64
 endif
 
+# The optimized ARM assembly code uses ARM-only (i.e not Thumb1/2
+# compatible) instructions.
+ifeq ($(BR2_arm)$(BR2_armeb):$(BR2_ARM_CPU_HAS_ARM),y:)
+MPIR_CONF_ENV += MPN_PATH="generic"
+endif
+
 $(eval $(autotools-package))