From 8ea97b120e691cae11883cef0c3cd6c184edeb4e Mon Sep 17 00:00:00 2001
From: kasper3 <33230602+kasper3@users.noreply.github.com>
Date: Mon, 23 Apr 2018 23:47:36 +0300
Subject: [PATCH] Set -march=armv7-a for Alpine Linux ARM32 (#17730)

* Set -march=armv7-a for Alpine Linux ARM32

* Remove armv7-linux-gnueabi[hf]

* Cast RLIM_INFINITY to size_t
---
 compileoptions.cmake   | 4 +---
 src/gc/unix/cgroup.cpp | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/compileoptions.cmake b/compileoptions.cmake
index 9c352e8bab..a6047d9190 100644
--- a/compileoptions.cmake
+++ b/compileoptions.cmake
@@ -62,12 +62,10 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM)
    # we have to set the triple by adding a compiler argument
    add_compile_options(-mthumb)
    add_compile_options(-mfpu=vfpv3)
+   add_compile_options(-march=armv7-a)
    if(ARM_SOFTFP)
      add_definitions(-DARM_SOFTFP)
      add_compile_options(-mfloat-abi=softfp)
-     add_compile_options(-target armv7-linux-gnueabi)
-   else()
-     add_compile_options(-target armv7-linux-gnueabihf)
    endif(ARM_SOFTFP)
 endif(CLR_CMAKE_PLATFORM_UNIX_ARM)
 
diff --git a/src/gc/unix/cgroup.cpp b/src/gc/unix/cgroup.cpp
index f892a339d8..42b99ef1df 100644
--- a/src/gc/unix/cgroup.cpp
+++ b/src/gc/unix/cgroup.cpp
@@ -404,7 +404,7 @@ size_t GetRestrictedPhysicalMemoryLimit()
          physical_memory_limit = SIZE_T_MAX;
 
     struct rlimit curr_rlimit;
-    size_t rlimit_soft_limit = RLIM_INFINITY;
+    size_t rlimit_soft_limit = (size_t)RLIM_INFINITY;
     if (getrlimit(RLIMIT_AS, &curr_rlimit) == 0)
     {
         rlimit_soft_limit = curr_rlimit.rlim_cur;
-- 
2.34.1