From 58a73d5c45680e2d4f228c6021dde7a92e600868 Mon Sep 17 00:00:00 2001 From: "jiseob.jang" Date: Wed, 13 Sep 2017 22:51:43 +0900 Subject: [PATCH] add Force-O3-build-with-clang3.8.patch Change-Id: I7368e5b85263ed2ed9059ebef3bdbb9587a7a250 Signed-off-by: jiseob.jang --- packaging/0030-Force-O3-build-with-clang3.8.patch | 28 +++++++++++++++++++++++ packaging/coreclr.spec | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 packaging/0030-Force-O3-build-with-clang3.8.patch diff --git a/packaging/0030-Force-O3-build-with-clang3.8.patch b/packaging/0030-Force-O3-build-with-clang3.8.patch new file mode 100644 index 0000000..a8ee396 --- /dev/null +++ b/packaging/0030-Force-O3-build-with-clang3.8.patch @@ -0,0 +1,28 @@ +From a7eb5e1e176cef2d8b4767094822c07f52fb5dde Mon Sep 17 00:00:00 2001 +From: Hanjoung Lee +Date: Wed, 13 Sep 2017 21:04:17 +0900 +Subject: [PATCH] Force O3 build with clang3.8 + +--- + 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 132be93c7..c809fb730 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=$( $CC --version | head -1 | sed 's/[^0-9]*\([0-9]*\.[0-9]*\).*/\1/' ) +-# 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 +-- +2.14.1 + diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec index 8448b4b..5f445bf 100644 --- a/packaging/coreclr.spec +++ b/packaging/coreclr.spec @@ -23,7 +23,7 @@ Source1000: downloaded_files.tar.gz Source1001: %{name}.manifest Source1002: libicu.tar.gz Source1003: dep_libs.tar.gz -# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 +# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 Patch0: 0001-Add-project.assets.json-files.patch Patch1: 0001-ARM-Linux-Support-unaligned-struct-read-write-11290.patch Patch2: 0002-x86-Linux-Thread-safe-UMThunkMarshInfo-RunTimeInit-1.patch @@ -55,6 +55,7 @@ Patch27: 0026-Port-DacUnwindStackFrame-11666.patch Patch28: 0027-Include-PAL-headers-instead-of-embedding-it-11705.patch Patch29: 0028-added-DWARF-exprloc-for-static-value-class-fields-11.patch Patch30: 0029-Fix-calculation-of-debuginfo-s-size.-13899.patch +Patch31: 0030-Force-O3-build-with-clang3.8.patch ExcludeArch: aarch64 @@ -185,6 +186,7 @@ cp %{SOURCE1001} . %patch28 -p1 %patch29 -p1 %patch30 -p1 +%patch31 -p1 %if 0%{skipmscorlib} %else -- 2.7.4