summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchunseok lee <chunseok.lee@samsung.com>2018-01-23 11:34:15 +0900
committerchunseok lee <chunseok.lee@samsung.com>2018-01-23 13:07:56 +0900
commitf1fe6dd843a43e308c8ea3ab68361b81550ba3ce (patch)
tree1b866da4b48675bc3cf221b87cfdf11bfc041000
parent3fc3c7e181accc13a9f1fa4c39422cce7474edc1 (diff)
downloadcoreclr-f1fe6dd843a43e308c8ea3ab68361b81550ba3ce.tar.gz
coreclr-f1fe6dd843a43e308c8ea3ab68361b81550ba3ce.tar.bz2
coreclr-f1fe6dd843a43e308c8ea3ab68361b81550ba3ce.zip
armoring request from PM team Change-Id: I32610d6a1a6a2364fe89a55b05bffcb3ac93e2ff Signed-off-by: chunseok lee <chunseok.lee@samsung.com>
-rw-r--r--packaging/coreclr.spec11
1 files changed, 9 insertions, 2 deletions
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index dbb6c6569f..194cf43c60 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -294,12 +294,19 @@ export PAL_API_TRACING="pal.log"
export PAL_DBG_CHANNELS=""
%endif
+%ifarch %{arm}
+# for armoring request from PM group
+# FIXME1: If you find better solution like CMAKE_CXX_FLAGS, please fix this
+# FIXME2: This patch does not work on non-arm archtecture
+export CXXFLAGS+="-fstack-protector-strong -D_FORTIFY_SOURCE=2"
+%endif
+
%if 0%{skipmscorlib}
%if 0%{skipnative}
# No build native and mscorlib.
%else
# Build native only.
-./build.sh %{_barch} %{_buildtype} clang3.8 skipmscorlib skipgenerateversion skipnuget %{testopt} cmakeargs "-DFEATURE_GDBJIT=TRUE -DFEATURE_DBGIPC=0 -DFEATURE_NI_BIND_FALLBACK=false -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++"
+./build.sh %{_barch} %{_buildtype} clang3.8 skipmscorlib skipgenerateversion skipnuget %{testopt} cmakeargs "-DFEATURE_GDBJIT=TRUE -DFEATURE_DBGIPC=0 -DFEATURE_NI_BIND_FALLBACK=false -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-z,relro -DCMAKE_EXE_LINKER_FLAGS=-Wl,-z,relro"
%endif
%else
%if 0%{skipnative}
@@ -307,7 +314,7 @@ export PAL_DBG_CHANNELS=""
./build.sh %{_barch} %{_buildtype} -skiprestore skipnative skipnuget %{testopt}
%else
# Build native and mscorlib.
-./build.sh %{_barch} %{_buildtype} clang3.8 skipgenerateversion -skiprestore skipnuget %{testopt} cmakeargs "-DFEATURE_GDBJIT=TRUE -DFEATURE_DBGIPC=0 -DFEATURE_NI_BIND_FALLBACK=false -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++"
+./build.sh %{_barch} %{_buildtype} clang3.8 skipgenerateversion -skiprestore skipnuget %{testopt} cmakeargs "-DFEATURE_GDBJIT=TRUE -DFEATURE_DBGIPC=0 -DFEATURE_NI_BIND_FALLBACK=false -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-z,relro -DCMAKE_EXE_LINKER_FLAGS=-Wl,-z,relro"
%endif
%endif