From 1b285d5ace0c04bafe0141d0d33af2b3c8524469 Mon Sep 17 00:00:00 2001
From: Woongsuk Cho <ws77.cho@samsung.com>
Date: Thu, 23 Dec 2021 11:55:18 +0900
Subject: [Tizen] Support armv7hl build

Patch to remove build errors that occur in armv7hl, a newly supported arch from Tizen 7.0.
Runtime test in armv7hl is not performed (to be verified after platform stabilization)
---
 packaging/coreclr.spec | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'packaging')

diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index a012e654ce..b4e2485cf0 100755
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -4,7 +4,7 @@
 %define skipnative 0
 %define skipmscorlib 0
 
-%ifarch %{arm} aarch64 %{ix86} x86_64
+%ifarch armv7l armv7hl aarch64 %{ix86} x86_64
 %else
 %define skiptests 1
 %endif
@@ -41,11 +41,16 @@ Requires: libunwind
 Requires: libuuid
 
 # Accelerate python, clang
-%ifarch %{arm}
+%ifarch armv7l
 BuildRequires: python-accel-armv7l-cross-arm
 BuildRequires: clang-accel-armv7l-cross-arm
 %endif
 
+%ifarch armv7hl
+BuildRequires: python-accel-armv7hl-cross-arm
+BuildRequires: clang-accel-armv7hl-cross-arm
+%endif
+
 %ifarch aarch64
 BuildRequires: python-accel-aarch64-cross-aarch64
 BuildRequires: clang-accel-aarch64-cross-aarch64
@@ -66,7 +71,7 @@ BuildRequires:  pkgconfig(lttng-ust)
 
 %if 0%{skipmscorlib}
 %else
-%ifarch %{arm} aarch64
+%ifarch armv7l armv7hl aarch64
 BuildRequires:  patchelf
 %endif
 %ifarch %{ix86}
@@ -117,7 +122,7 @@ cp %{SOURCE1} .
 
 %if 0%{skipmscorlib}
 %else
-%ifarch %{arm} aarch64
+%ifarch armv7l armv7hl aarch64
 # Detect interpreter name from cross-gcc
 LD_INTERPRETER=$(patchelf --print-interpreter /emul/usr/bin/gcc)
 LD_RPATH=$(patchelf --print-rpath /emul/usr/bin/gcc)
@@ -166,17 +171,22 @@ export CLANG_NO_LIBDIR_SUFFIX=1
 BASE_FLAGS="$(echo $BASE_FLAGS | sed -e 's/--target=i686/--target=i586/')"
 BASE_FLAGS="$BASE_FLAGS -mstackrealign"
 %else
-%ifarch %{arm}
+%ifarch armv7l
 %define _barch  armel
 export CLANG_NO_LIBDIR_SUFFIX=1
 %else
+%ifarch armv7hl
+%define _barch  arm
+export CLANG_NO_LIBDIR_SUFFIX=1
+%else
 
 %endif
 %endif
 %endif
 %endif
+%endif
 
-%ifarch %{arm}
+%ifarch armv7l armv7hl
 %define _tarch arm
 %endif
 %ifarch aarch64
@@ -197,7 +207,7 @@ export CFLAGS="${BASE_FLAGS}"
 export CXXFLAGS="${BASE_FLAGS}"
 export ASMFLAGS="${BASE_FLAGS}"
 
-%ifarch %{arm}
+%ifarch armv7l armv7hl
 %if %{dotnet_buildtype} == "Release"
 export CXXFLAGS+="-fstack-protector-strong -D_FORTIFY_SOURCE=2"
 %else
@@ -219,7 +229,7 @@ export CXXFLAGS+="-fstack-protector-strong"
 %endif
 %endif
 
-%ifarch %{arm} aarch64
+%ifarch armv7l armv7hl aarch64
 %define _ngen_relocs_opts cmakeargs "-DFEATURE_NGEN_RELOCS_OPTIMIZATIONS=true"
 %else
 %define _ngen_relocs_opts ""
-- 
cgit v1.2.3