From 1bb2e3e73db2defbd1187bbb551f943fd67bb412 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Thu, 9 Jun 2016 18:30:52 +0900 Subject: Add -DARM_SOFTFP inside compileoptions.cmake (#5630) Currently, '-DARM_SOFTFP' is added inside jit/CMakeList.txt and vm/CMakeLists.txt, and thus the header definition might be inconsistent across each componenet. This inconsistency results in some strange behavior discussed in #5629. This commit tries to enforce the consistent definition of '-DARM_SOFTFP' for every component via definiing it inside compileoptions.cmake in order to fix #5629. --- compileoptions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compileoptions.cmake') diff --git a/compileoptions.cmake b/compileoptions.cmake index d058b66e62..75d51fd5bb 100644 --- a/compileoptions.cmake +++ b/compileoptions.cmake @@ -49,7 +49,6 @@ if (CLR_CMAKE_PLATFORM_UNIX) # Some architectures (e.g., ARM) assume char type is unsigned while CoreCLR assumes char is signed # as x64 does. It has been causing issues in ARM (https://github.com/dotnet/coreclr/issues/4746) add_compile_options(-fsigned-char) - endif(CLR_CMAKE_PLATFORM_UNIX) if(CLR_CMAKE_PLATFORM_UNIX_ARM) @@ -58,6 +57,7 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM) add_compile_options(-mthumb) add_compile_options(-mfpu=vfpv3) if(ARM_SOFTFP) + add_definitions(-DARM_SOFTFP) add_compile_options(-mfloat-abi=softfp) add_compile_options(-target armv7-linux-gnueabi) else() -- cgit v1.2.3