Skip to contentSkip to conversation

Fix xenomai build with Linaro toolchain

PATCH New Thierry Bultel 2 participants 2 messages Dec 13, 2012

lore
Share & tools
lore

Thierry Bultel

author
#0 lore raw

PATCH 1/1 Fix xenomai build with Linaro toolchain

This fixes the build with toolchains that have -mthumb by default (Not supported by xenomai yet)

Signed-off-by thierry.bultel at wanadoo.fr
xenomai.mk.orig renamed from xenomai.mk +6 -0
@@ -24,6 +23,12 @@
 
  XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/
 
+XENOMAI_CONF_ENV = \
+	CFLAGS="$(TARGET_CFLAGS) -marm"
+	
+XENOMAI_MAKE_ENV = \
+	CFLAGS="$(TARGET_CFLAGS) -marm"
+
  ifeq ($(BR2_HAVE_DEVFILES),)
  define XENOMAI_REMOVE_DEVFILES
  	for i in xeno-config xeno-info wrap-link.sh ; do \
#1 lore raw

PATCH 1/1 Fix xenomai build with Linaro toolchain

xenomai.mk.orig 2012-12-13 23:01:13.473982051 +0100

Quoted 7 lines · Thierry Bultel

This fixes the build with toolchains that have -mthumb by default (Not supported by xenomai yet)

Signed-off-by thierry.bultel at wanadoo.fr
xenomai.mk.orig 2012-12-13 23:01:13.473982051 +0100 renamed from xenomai.mk 2012-12-13 22:48:05.841982812 +0100 +0 -0

This won't apply with git am. Could you create the patch with
git send-email?

Quoted 6 lines
xenomai.mk.orig 2012-12-13 23:01:13.473982051 +0100 renamed from xenomai.mk 2012-12-13 22:48:05.841982812 +0100 +0 -0
@@ -24,6 +23,12 @@

XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/

+XENOMAI_CONF_ENV = \
+ CFLAGS="$(TARGET_CFLAGS) -marm"

Wouldn't it be a good idea to make this conditional on BR2_arm? :-)

I would also use XENOMAI_CONF_ENV +=, easier for the future.

xenomai.mk.orig 2012-12-13 23:01:13.473982051 +0100

Quoted 3 lines
xenomai.mk.orig 2012-12-13 23:01:13.473982051 +0100 renamed from xenomai.mk 2012-12-13 22:48:05.841982812 +0100 +3 -0
+
+XENOMAI_MAKE_ENV = \
+ CFLAGS="$(TARGET_CFLAGS) -marm"

Is this needed? Should be enough to do it in the CONF_ENV because
the CFLAGS are directly replaced in the Makefiles...

Regards,
Arnout

Quoted 4 lines

+
ifeq ($(BR2_HAVE_DEVFILES),)
define XENOMAI_REMOVE_DEVFILES
for i in xeno-config xeno-info wrap-link.sh ; do \

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F