Skip to contentSkip to conversation

boost: force the target ABI for ARM architecture

PATCH New Thomas Petazzoni 2 participants 2 messages Sep 6, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 boost: force the target ABI for ARM architecture

Just like was done in commit b37641c95be79fcb76cbc7042c4cf21a2c64d0f6 ("boost: Force the target ABI for MIPS architecture") by Vicente for the MIPS architecture, this commit also forces the ABI passed to Boost build system to "aapcs" for the ARM architecture.

Since we now have three cases to handle, an intermediate variable called BOOST_ABI is introduced.

Fixes:

http://autobuild.buildroot.org/results/5ae/5aeb3a9f067faf6687051643bf49a0b619cb4c3b/

Cc Vicente Olivert Riera <[email protected]>
---
 package/boost/boost.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/boost/boost.mk +9 -1
index ac67e3c..caaeec0 100644
@@ -80,9 +80,17 @@ endif
 HOST_BOOST_OPT += toolset=gcc threading=multi variant=release link=shared \
 	runtime-link=shared
 
+ifeq ($(BR2_MIPS_OABI32),y)
+BOOST_ABI = o32
+else ifeq ($(BR2_arm),y)
+BOOST_ABI = aapcs
+else
+BOOST_ABI = sysv
+endif
+
 BOOST_OPT += toolset=gcc \
 	     threading=multi \
-	     abi=$(if $(BR2_MIPS_OABI32),o32,sysv) \
+	     abi=$(BOOST_ABI) \
 	     variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \
 	     link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
 	     runtime-link=$(if $(BR2_PREFER_STATIC_LIB),static,shared)
Signature · 1 line
2.0.0
#1 lore raw

PATCH 1/1 boost: force the target ABI for ARM architecture

Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Just like was done in commit b37641c95be79fcb76cbc7042c4cf21a2c64d0f6 ("boost: Force the target ABI for MIPS architecture") by Vicente for the MIPS architecture, this commit also forces the ABI passed to Boost build system to "aapcs" for the ARM architecture.

Since we now have three cases to handle, an intermediate variable called BOOST_ABI is introduced.

Quoted 6 lines

Fixes:

http://autobuild.buildroot.org/results/5ae/5aeb3a9f067faf6687051643bf49a0b619cb4c3b/

Cc Vicente Olivert Riera <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard