cmake: boost fixes for ARM 32 bit

see https://github.com/boostorg/context/pull/94

we should drop this change once ceph uses boost 1.70 or up

Signed-off-by: Daniel Glaser <me@the78mole.de>

diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
index f46cc0d485375e8d1bbcc77f336541107ec0474a..c75eaff6e4835f7897c5253eb251922822b32492 100644 (file)
--- a/cmake/modules/BuildBoost.cmake
+++ b/cmake/modules/BuildBoost.cmake
@@ -163,6 +163,7 @@ function(do_build_boost version)
   include(ExternalProject)
   ExternalProject_Add(Boost
     ${source_dir}
+    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/boost_context_asm_arm_syntax_unified.patch
     CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${configure_command}
     BUILD_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${build_command}
     BUILD_IN_SOURCE 1

diff --git a/patches/boost_context_asm_arm_syntax_unified.patch b/patches/boost_context_asm_arm_syntax_unified.patch
new file mode 100644 (file)
index 0000000..1106a00
--- /dev/null
+++ b/patches/boost_context_asm_arm_syntax_unified.patch
@@ -0,0 +1,36 @@
+diff --git a/libs/context/src/asm/jump_arm_aapcs_elf_gas.S b/src/Boost/libs/context/src/asm/jump_arm_aapcs_elf_gas.S
+index d0f7fa2..58d11b0 100644
+--- a/libs/context/src/asm/jump_arm_aapcs_elf_gas.S
++++ b/libs/context/src/asm/jump_arm_aapcs_elf_gas.S
+@@ -42,6 +42,7 @@
+ .globl jump_fcontext
+ .align 2
+ .type jump_fcontext,%function
++.syntax unified
+ jump_fcontext:
+     @ save LR as PC
+     push {lr}
+diff --git a/libs/context/src/asm/make_arm_aapcs_elf_gas.S b/src/Boost/libs/context/src/asm/make_arm_aapcs_elf_gas.S
+index 98819a2..b88ff68 100644
+--- a/libs/context/src/asm/make_arm_aapcs_elf_gas.S
++++ b/libs/context/src/asm/make_arm_aapcs_elf_gas.S
+@@ -42,6 +42,7 @@
+ .globl make_fcontext
+ .align 2
+ .type make_fcontext,%function
++.syntax unified
+ make_fcontext:
+     @ shift address in A1 to lower 16 byte boundary
+     bic  a1, a1, #15
+diff --git a/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S b/src/Boost/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S
+index 9d9198f..2efebbb 100644
+--- a/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S
++++ b/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S
+@@ -42,6 +42,7 @@
+ .globl ontop_fcontext
+ .align 2
+ .type ontop_fcontext,%function
++.syntax unified
+ ontop_fcontext:
+     @ save LR as PC
+     push {lr}