summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2017-04-21 06:53:22 (GMT)
committerJiyoung Yun <jy910.yun@samsung.com>2017-04-21 06:53:22 (GMT)
commitdf820e4ae41127feb4af86b5963934eeb1104fad (patch)
treeddc0e45ba72223922d6030f23e046c200edc4874
parent09bad7e773e617096de05222b9953cba0cacb9a1 (diff)
downloadcoreclr-df820e4ae41127feb4af86b5963934eeb1104fad.zip
coreclr-df820e4ae41127feb4af86b5963934eeb1104fad.tar.gz
coreclr-df820e4ae41127feb4af86b5963934eeb1104fad.tar.bz2
Change-Id: I507f4957b634bec3b0b1959872bdc2752da7bb3b Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
-rw-r--r--packaging/Change-O3-build-in-clang3.8.patch29
-rw-r--r--packaging/coreclr.spec8
2 files changed, 34 insertions, 3 deletions
diff --git a/packaging/Change-O3-build-in-clang3.8.patch b/packaging/Change-O3-build-in-clang3.8.patch
new file mode 100644
index 0000000..703121a
--- /dev/null
+++ b/packaging/Change-O3-build-in-clang3.8.patch
@@ -0,0 +1,29 @@
+From e0909aac25fe2a5a02e2396457f2f8b0c07adf8e Mon Sep 17 00:00:00 2001
+From: Jiyoung Yun <jy910.yun@samsung.com>
+Date: Thu, 20 Apr 2017 11:18:59 +0900
+Subject: [PATCH] Change O3 build in clang3.8
+
+Change-Id: Ibc02c4d4e340d66347514459e37c01cb69fc6a52
+---
+ src/pal/tools/gen-buildsys-clang.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh
+index 762a199..eebb8d6 100755
+--- a/src/pal/tools/gen-buildsys-clang.sh
++++ b/src/pal/tools/gen-buildsys-clang.sh
+@@ -156,9 +156,9 @@ if [ "$build_arch" == "armel" ]; then
+ fi
+
+ clang_version=$(echo $CC | awk -F- '{ print $NF }')
+-# Use O1 option when the clang version is smaller than 3.9
++# Use O1 option when the clang version is smaller than 3.8
+ # Otherwise use O3 option in release build
+-if [[ ( ${clang_version%.*} -eq 3 && ${clang_version#*.} -lt 9 ) &&
++if [[ ( ${clang_version%.*} -eq 3 && ${clang_version#*.} -lt 8 ) &&
+ ( "$build_arch" == "arm" || "$build_arch" == "armel" ) ]]; then
+ overridefile=clang-compiler-override-arm.txt
+ else
+--
+1.9.1
+
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 1a85960..05ee6d8 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -23,9 +23,10 @@ Source1000: downloaded_files.tar.gz
Source1001: %{name}.manifest
Source1002: libicu.tar.gz
Source1003: dep_libs.tar.gz
-# Gbp-Ignore-Patches: 0 1
+# Gbp-Ignore-Patches: 0 1 2
Patch0: Add-project.lock.json-files.patch
Patch1: Add-Tizen-RuntimeID-case.patch
+Patch2: Change-O3-build-in-clang3.8.patch
ExcludeArch: aarch64
@@ -112,6 +113,7 @@ cp %{SOURCE1001} .
# Gbp-Patch-Macros
%patch0 -p1
%patch1 -p1
+%patch2 -p1
cp %{SOURCE1000} ./
tar xf %{SOURCE1000}
%ifarch %{arm} %{ix86}
@@ -231,7 +233,7 @@ export PAL_DBG_CHANNELS=""
# No build native and mscorlib.
%else
# Build native only.
-./build.sh %{_barch} %{_buildtype} clang3.8 skipmscorlib skipgenerateversion skipnuget %{testopt} cmakeargs -DFEATURE_GDBJIT=TRUE
+./build.sh %{_barch} %{_buildtype} clang3.8 skipmscorlib skipgenerateversion skipnuget %{testopt} stripSymbols cmakeargs -DFEATURE_GDBJIT=TRUE
%endif
%else
%if 0%{skipnative}
@@ -239,7 +241,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
+./build.sh %{_barch} %{_buildtype} clang3.8 skipgenerateversion -skiprestore skipnuget %{testopt} stripSymbols cmakeargs -DFEATURE_GDBJIT=TRUE
%endif
%endif