From 31277ec73930e0a613c84aa7589c7a9129bdda98 Mon Sep 17 00:00:00 2001 From: Jaehun Jeong Date: Tue, 11 Jul 2017 17:23:46 +0900 Subject: Add hard-float option to spec file Signed-off-by: Jaehun Jeong Signed-off-by: Dongkyun Son --- compileoptions.cmake | 1 + packaging/coreclr.spec | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/compileoptions.cmake b/compileoptions.cmake index 75d51fd5bb..45541b9987 100644 --- a/compileoptions.cmake +++ b/compileoptions.cmake @@ -61,6 +61,7 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM) add_compile_options(-mfloat-abi=softfp) add_compile_options(-target armv7-linux-gnueabi) else() + add_compile_options(-mfloat-abi=hard) add_compile_options(-target armv7-linux-gnueabihf) endif(ARM_SOFTFP) endif(CLR_CMAKE_PLATFORM_UNIX_ARM) diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec index 3995c48ba1..a8a6fe32b8 100644 --- a/packaging/coreclr.spec +++ b/packaging/coreclr.spec @@ -201,14 +201,26 @@ export C_INCLUDE_PATH="${LLVM_INCLUDEDIR}/llvm-c/:%{_includedir}" %else %ifarch %{arm} +%ifarch armv7l %define _barch armel +%endif +%ifarch armv7hl +%define _barch arm +%endif %if 0%{skipnative} %else +%ifarch armv7l export CFLAGS="${CFLAGS} -U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w" export CPPFLAGS="${CPPFLAGS} -U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w" export CXXFLAGS="${CXXFLAGS} -U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w" %endif +%ifarch armv7hl +export CFLAGS="${CFLAGS} -U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=hard -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w" +export CPPFLAGS="${CPPFLAGS} -U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=hard -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w" +export CXXFLAGS="${CXXFLAGS} -U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=hard -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w" +%endif +%endif %else # write the paths in general! -- cgit v1.2.3