Enable build with updated clang

Explicit options passing is not needed now and compiler is detected
automatically.

Change-Id: I5b0b1ab330cd0e3150c6848b63f3ed9d205c8a22
Signed-off-by: Slava Barinov <v.barinov@samsung.com>

2 files changed, 74 insertions, 39 deletions

diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 3995c48ba1..13e0c663d2 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
+# Gbp-Ignore-Patches: 0 1 2 3 4 5 6 7 8 9 10 11 12
 Patch0:     Add-project.assets.json-files.patch
 Patch1:     Add-Tizen-RuntimeID-case.patch
 Patch2:     Change-O3-build-in-clang3.8.patch
@@ -36,6 +36,7 @@ Patch8:     Add-skipped-testcase-on-TM1.patch
 Patch9:     Set-local-variables-as-addr-exposed-if-it-appears-in.patch
 Patch10:    Revert-unnecessary-changes.patch
 Patch11:    Add-skipped-testcase-superpmi.patch
+Patch12:    tizen-toolchain-support.patch
 
 ExcludeArch: aarch64
 
@@ -55,6 +56,15 @@ Requires: libstdc++
 Requires: libunwind
 Requires: libuuid
 
+# Accelerate python
+%ifarch %{arm}
+BuildRequires: python-accel-armv7l-cross-arm
+%endif
+
+%ifarch aarch64
+BuildRequires: python-accel-aarch64-cross-aarch64
+%endif
+
 %if 0%{skipnative}
 %else
 BuildRequires:  cmake
@@ -130,6 +140,7 @@ cp %{SOURCE1001} .
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %if 0%{skipmscorlib}
 %else
 cp %{SOURCE1000} ./
@@ -161,57 +172,32 @@ done
 %endif
 
 %build
-# Detect paths to toolchain headers in universal way
-export GCC_INSTALL_DIR=$(gcc -print-search-dirs | sed -ne '/install: /s/install: //p')
-export LLVM_LIBDIR=$(llvm-config --libdir)
-export LLVM_INCLUDEDIR=$(llvm-config --includedir)
-export GPP_INCLUDE_PATHS=$(cpp -xc++ -v < /dev/null 2>&1 | \
-          awk '/search starts here:/{flag=1;next}/End of search list/{flag=0}flag' | \
-          sed -e "s/^ //" | tr '\n' ':' | sed -e 's/.$//')
-export CLANG_INCLUDE_PATHS=$(clang++ -E -xc++ - -v < /dev/null 2>&1 | \
-          awk '/search starts here:/{flag=1;next}/End of search list/{flag=0}flag' | \
-          sed -e "s/^ //" | tr '\n' ':' | sed -e 's/.$//')
-export CLANG_HEADERS=$(clang++ -print-search-dirs 2>&1 | sed -ne '/libraries: /s/libraries: =//p' | sed -ne 's|:.*|/include|p')
-
-# NOTHING to build
 
-%if 0%{skipnative}
-%else
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${LLVM_LIBDIR}:${GCC_INSTALL_DIR}
-export LIBRARY_PATH=$LIBRARY_PATH:${LLVM_LIBDIR}:${GCC_INSTALL_DIR}
-export CFLAGS=" -B${LLVM_LIBDIR} -B${GCC_INSTALL_DIR} -Wno-deprecated-declarations -D__extern_always_inline=inline"
-export CPPFLAGS=" -B${LLVM_LIBDIR} -B${GCC_INSTALL_DIR} -Wno-deprecated-declarations -D__extern_always_inline=inline"
-export CXXFLAGS=" -B${LLVM_LIBDIR} -B${GCC_INSTALL_DIR} -Wno-deprecated-declarations -D__extern_always_inline=inline"
-export CPLUS_INCLUDE_PATH="${LLVM_INCLUDEDIR}/llvm/:${LLVM_INCLUDEDIR}/llvm-c/:${CLANG_HEADERS}:${GPP_INCLUDE_PATHS}:${CLANG_INCLUDE_PATHS}"
-export C_INCLUDE_PATH="${LLVM_INCLUDEDIR}/llvm-c/:%{_includedir}"
-%endif
+# These flags aren't supported by clang
+export CFLAGS=$(echo $CFLAGS | sed -e "s/-Wa,-mimplicit-it=thumb//;s/-mimplicit-it=thumb//;s/-Wl,--hash-style=gnu//;s/-Wl,-O1//;s/-Wl,--as-needed//")
+export CXXFLAGS=$(echo $CXXFLAGS | sed -e "s/-integrated-as//;s/-mimplicit-it=thumb//;s/-Wl,--hash-style=gnu//;s/-Wl,-O1//;s/-Wl,--as-needed//")
+
+export CFLAGS+=" --target=%{_host} "
+export CXXFLAGS+=" --target=%{_host} "
 
 %ifarch x86_64
 # Even though build architectur is x86_64, it will be running on arm board.
 # So we need to pass the arch argument as arm.
 %define _barch  %{?cross:%{cross}}%{!?cross:x64}
-
 %else
 %ifarch aarch64
 %define _barch  arm64
-
 %else
 %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/')
 %else
 %ifarch %{arm}
 %define _barch  armel
-
-%if 0%{skipnative}
-%else
-export CFLAGS="${CFLAGS} -U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w"
-export CPPFLAGS="${CPPFLAGS} -U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -O2 --param=ssp-buffer-size=32 -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w"
-export CXXFLAGS="${CXXFLAGS} -U__GNUC_MINOR__ -D__GNUC_MINOR__=3 -O2 --param=ssp-buffer-size=32  -fdiagnostics-color=never -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Wno-error=inline-asm -integrated-as -Wno-ignored-attributes -Wno-switch-enum -Wno-switch -Wno-error=switch -Wno-error=switch-enum -w"
-%endif
-
+export CLANG_NO_LIBDIR_SUFFIX=1
 %else
-# write the paths in general!
 
 %endif
 %endif
@@ -251,15 +237,15 @@ 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 cmakeargs -DFEATURE_DBGIPC=0
+./build.sh %{_barch} %{_buildtype} clang3.8 skipmscorlib skipgenerateversion skipnuget %{testopt} cmakeargs -DFEATURE_GDBJIT=TRUE cmakeargs -DFEATURE_DBGIPC=0 cmakeargs -DCMAKE_C_COMPILER=/usr/bin/clang cmakeargs -DCMAKE_CXX_COMPILER=/usr/bin/clang++
 %endif
 %else
 %if 0%{skipnative}
 # Build mscorlib only.
-./build.sh %{_barch} %{_buildtype} -skiprestore skipnative skipnuget %{testopt} -- /p:RestorePackages=false
+./build.sh %{_barch} %{_buildtype} -skiprestore skipnative skipnuget %{testopt}
 %else
 # Build native and mscorlib.
-./build.sh %{_barch} %{_buildtype} clang3.8 skipgenerateversion skipnuget %{testopt} cmakeargs -DFEATURE_GDBJIT=TRUE cmakeargs -DFEATURE_DBGIPC=0 cmakeargs -DFEATURE_NI_BIND_FALLBACK=false -- /p:RestorePackages=false
+./build.sh %{_barch} %{_buildtype} clang3.8 skipgenerateversion -skiprestore skipnuget %{testopt} cmakeargs -DFEATURE_GDBJIT=TRUE cmakeargs -DFEATURE_DBGIPC=0 cmakeargs -DCMAKE_C_COMPILER=/usr/bin/clang cmakeargs -DCMAKE_CXX_COMPILER=/usr/bin/clang++
 %endif
 %endif
 
diff --git a/packaging/tizen-toolchain-support.patch b/packaging/tizen-toolchain-support.patch
new file mode 100644
index 0000000000..531bf781c6
--- /dev/null
+++ b/packaging/tizen-toolchain-support.patch
@@ -0,0 +1,49 @@
+From 8f291c286db9813e6c797030707b41872b9616a6 Mon Sep 17 00:00:00 2001
+From: Jiyoung Yun <jy910.yun@samsung.com>
+Date: Fri, 14 Jul 2017 11:58:39 +0900
+Subject: [PATCH] tizen toolchain support
+
+Change-Id: Idb48d26dc1dfff8a6dc758b90bc94cb48963f8a2
+---
+ compileoptions.cmake        | 2 +-
+ cross/armel/toolchain.cmake | 9 +--------
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/compileoptions.cmake b/compileoptions.cmake
+index 75d51fd..4649ea3 100644
+--- a/compileoptions.cmake
++++ b/compileoptions.cmake
+@@ -59,7 +59,7 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM)
+    if(ARM_SOFTFP)
+      add_definitions(-DARM_SOFTFP)
+      add_compile_options(-mfloat-abi=softfp)
+-     add_compile_options(-target armv7-linux-gnueabi)
++     add_compile_options(-target armv7l-tizen-linux-gnueabi)
+    else()
+      add_compile_options(-target armv7-linux-gnueabihf)
+    endif(ARM_SOFTFP)
+diff --git a/cross/armel/toolchain.cmake b/cross/armel/toolchain.cmake
+index 86e2306..84f41f1 100644
+--- a/cross/armel/toolchain.cmake
++++ b/cross/armel/toolchain.cmake
+@@ -16,16 +16,9 @@ set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -target ${TOOLCHAIN}")
+ set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}")
+ 
+ if("$ENV{__DistroRid}" MATCHES "tizen.*")
+-    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/6.2.1")
+-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
+-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
++    add_compile_options(-target armv7l-tizen-linux-gnueabi)
+     add_compile_options(-Wno-deprecated-declarations) # compile-time option
+     add_compile_options(-D__extern_always_inline=inline) # compile-time option
+-
+-    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+-    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib")
+-    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib")
+-    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
+ else()
+     # TODO: this setting assumes debian armel rootfs
+     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/include/c++/4.9)
+-- 
+1.9.1
+