diff options
author | Mikhail Kashkarov <m.kashkarov@partner.samsung.com> | 2019-12-26 17:41:10 +0300 |
---|---|---|
committer | Mikhail Kashkarov <m.kashkarov@partner.samsung.com> | 2019-12-30 08:29:29 +0300 |
commit | 527286f3e410314e8979d0b928a4559d56aa6ec9 (patch) | |
tree | 48b3d20df208ce70eca5edff47571389eddf0c2c | |
parent | 94e458e93da3d5867938ea9a80489f5a0a66d7f0 (diff) | |
download | coreclr-sandbox/mkashkarov/tizen_6.0_build.tar.gz coreclr-sandbox/mkashkarov/tizen_6.0_build.tar.bz2 coreclr-sandbox/mkashkarov/tizen_6.0_build.zip |
[WIP] Build with gccsandbox/mkashkarov/tizen_6.0_build
-rwxr-xr-x | build.sh | 2 | ||||
-rw-r--r-- | configurecompiler.cmake | 9 | ||||
-rw-r--r-- | cross/toolchain.cmake | 2 | ||||
-rw-r--r-- | eng/common/cross/toolchain.cmake | 4 | ||||
-rwxr-xr-x | packaging/coreclr.spec | 9 |
5 files changed, 16 insertions, 10 deletions
@@ -290,7 +290,7 @@ build_native() echo "Executing $buildTool install -j $__NumProc" - $buildTool install -j $__NumProc + $buildTool VERBOSE=2 install -j $__NumProc if [ $? != 0 ]; then echo "Failed to build $message." exit 1 diff --git a/configurecompiler.cmake b/configurecompiler.cmake index 423bb40129..307325888e 100644 --- a/configurecompiler.cmake +++ b/configurecompiler.cmake @@ -548,11 +548,18 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM) # we have to set the triple by adding a compiler argument add_compile_options(-mthumb) add_compile_options(-mfpu=vfpv3) + # XXX Quick hack + # /usr/include/features.h:382:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] + # 382 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) + add_compile_options(-O2) + if(ARM_SOFTFP) add_definitions(-DARM_SOFTFP) add_compile_options(-mfloat-abi=softfp) if("$ENV{__DistroRid}" MATCHES "tizen.*") - add_compile_options(-target armv7l-tizen-linux-gnueabi) + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + add_compile_options(-target armv7l-tizen-linux-gnueabi) + endif() else() add_compile_options(-march=armv7-a) endif() diff --git a/cross/toolchain.cmake b/cross/toolchain.cmake index 75c2e27cdc..240bd5e756 100644 --- a/cross/toolchain.cmake +++ b/cross/toolchain.cmake @@ -8,7 +8,7 @@ if(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if("$ENV{__DistroRid}" MATCHES "tizen.*") - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/6.2.1") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm") set(CMAKE_SYSTEM_PROCESSOR armv7l) diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 071d411241..9719b85ba5 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -79,8 +79,8 @@ add_compile_param(CMAKE_MODULE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE # Specify compile options add_compile_options("--sysroot=${CROSS_ROOTFS}") -add_compile_options("--target=${TOOLCHAIN}") -add_compile_options("--gcc-toolchain=${CROSS_ROOTFS}/usr") +# add_compile_options("--target=${TOOLCHAIN}") +# add_compile_options("--gcc-toolchain=${CROSS_ROOTFS}/usr") if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$") set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec index 2542b79e82..620d2473fd 100755 --- a/packaging/coreclr.spec +++ b/packaging/coreclr.spec @@ -153,7 +153,7 @@ export LD_LIBRARY_PATH=`pwd`/libicu-57.1 export TIZEN_ASAN_ENVIRONMENT=1 } -BASE_FLAGS=" --target=%{_host} " +BASE_FLAGS="" %ifarch x86_64 # Even though build architectur is x86_64, it will be running on arm board. @@ -166,7 +166,6 @@ BASE_FLAGS=" --target=%{_host} " %ifarch %{ix86} %define _barch x86 export CLANG_NO_LIBDIR_SUFFIX=1 -BASE_FLAGS="$(echo $BASE_FLAGS | sed -e 's/--target=i686/--target=i586/')" BASE_FLAGS="$BASE_FLAGS -mstackrealign" %else %ifarch %{arm} @@ -221,19 +220,19 @@ export CXXFLAGS+="-fstack-protector-strong" # Build native only. export NUGET_PACKAGES=%{_builddir}/%{name}-%{version}/.packages/ export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/libicu-57.1/ -./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -skipmscorlib -skipgenerateversion -skipnuget -msbuildonunsupportedplatform -cmakeargs "-DFEATURE_PREJIT=true -DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION=true -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro" %{_ngen_relocs_opts} %{_pgo_flags} +./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -skipmscorlib -skipgenerateversion -skipnuget -msbuildonunsupportedplatform -cmakeargs "-DFEATURE_PREJIT=true -DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION=true -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro" %{_ngen_relocs_opts} %{_pgo_flags} -gcc %endif %else %if 0%{skipnative} # Build mscorlib only. export NUGET_PACKAGES=%{_builddir}/%{name}-%{version}/.packages/ export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/libicu-57.1/ -./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -skiprestore -skiprestoreoptdata -skipnative -skipnuget -skipcrossgen -msbuildonunsupportedplatform +./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -skiprestore -skiprestoreoptdata -skipnative -skipnuget -skipcrossgen -msbuildonunsupportedplatform -gcc %else # Build native and mscorlib. export NUGET_PACKAGES=%{_builddir}/%{name}-%{version}/.packages/ export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/libicu-57.1/ -./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -skipgenerateversion -skiprestore -skiprestoreoptdata -skipnuget -skipcrossgen -msbuildonunsupportedplatform -cmakeargs "-DFEATURE_IBCLOGGER=true -DFEATURE_PREJIT=true -DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION=true -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro" %{_ngen_relocs_opts} %{_pgo_flags} +./build.sh -%{_barch} -%{_buildtype} -numproc %{_numproc} -skipgenerateversion -skiprestore -skiprestoreoptdata -skipnuget -skipcrossgen -msbuildonunsupportedplatform -cmakeargs "-DFEATURE_IBCLOGGER=true -DFEATURE_PREJIT=true -DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION=true -DCLR_ADDITIONAL_LINKER_FLAGS=-Wl,-z,relro" %{_ngen_relocs_opts} %{_pgo_flags} -gcc %endif %endif |