From 762d3bd09db51d983c77388657493e679637e940 Mon Sep 17 00:00:00 2001 From: Mikhail Kashkarov Date: Fri, 6 Dec 2019 18:57:11 +0300 Subject: [Tizen] Use -mstackrealign to sync up with Tizen build changes Tizen i586 now builds with -mstackrealign by default: "Realign the stack at entry. On the x86, the -mstackrealign option generates an alternate prologue and epilogue that realigns the run-time stack if necessary. This supports mixing legacy codes that keep 4-byte stack alignment with modern codes that keep 16-byte stack alignment for SSE compatibility. ..." Change-Id: I36afd18998829f897c6b2b48687c4ae1d172b84b Signed-off-by: Mikhail Kashkarov --- packaging/coreclr.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec index 1b621d758b..2542b79e82 100755 --- a/packaging/coreclr.spec +++ b/packaging/coreclr.spec @@ -153,8 +153,7 @@ export LD_LIBRARY_PATH=`pwd`/libicu-57.1 export TIZEN_ASAN_ENVIRONMENT=1 } -export CFLAGS=" --target=%{_host} " -export CXXFLAGS=" --target=%{_host} " +BASE_FLAGS=" --target=%{_host} " %ifarch x86_64 # Even though build architectur is x86_64, it will be running on arm board. @@ -167,8 +166,8 @@ export CXXFLAGS=" --target=%{_host} " %ifarch %{ix86} %define _barch x86 export CLANG_NO_LIBDIR_SUFFIX=1 -export CFLAGS=$(echo $CFLAGS | sed -e 's/--target=i686/--target=i586/') -export CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/--target=i686/--target=i586/') +BASE_FLAGS="$(echo $BASE_FLAGS | sed -e 's/--target=i686/--target=i586/')" +BASE_FLAGS="$BASE_FLAGS -mstackrealign" %else %ifarch %{arm} %define _barch armel @@ -184,6 +183,9 @@ export CLANG_NO_LIBDIR_SUFFIX=1 %define _reldir bin/Product/Linux.%{_barch}.%{_buildtype} %define _numproc %(getconf _NPROCESSORS_ONLN) +export CFLAGS="${BASE_FLAGS}" +export CXXFLAGS="${BASE_FLAGS}" + %ifarch %{arm} %if %{dotnet_buildtype} == "Release" export CXXFLAGS+="-fstack-protector-strong -D_FORTIFY_SOURCE=2" -- cgit v1.2.3