From 233cefbbfda917317fccfdce1bd35e3e8e7ef1bd Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 11 Feb 2020 13:35:15 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20200210.11 (#447)
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20110.11
---
eng/Version.Details.xml | 4 ++--
eng/common/cross/toolchain.cmake | 12 +++++++++++-
global.json | 2 +-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b6627d7a0..bc2575e72 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- b0e8d3944155f94f83deea8afe025debe369e69f
+ 56e162725058d80918f7aa7e0e689e1fde5c2106
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 0eea7d1df..556da2e13 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -71,7 +71,17 @@ endif()
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
add_compile_options(-mthumb)
- add_compile_options(-mfpu=vfpv3)
+ if (NOT DEFINED CLR_ARM_FPU_TYPE)
+ set (CLR_ARM_FPU_TYPE vfpv3)
+ endif (NOT DEFINED CLR_ARM_FPU_TYPE)
+
+ add_compile_options (-mfpu=${CLR_ARM_FPU_TYPE})
+ if (NOT DEFINED CLR_ARM_FPU_CAPABILITY)
+ set (CLR_ARM_FPU_CAPABILITY 0x7)
+ endif (NOT DEFINED CLR_ARM_FPU_CAPABILITY)
+
+ add_definitions (-DCLR_ARM_FPU_CAPABILITY=${CLR_ARM_FPU_CAPABILITY})
+
if(TARGET_ARCH_NAME STREQUAL "armel")
add_compile_options(-mfloat-abi=softfp)
if(DEFINED TIZEN_TOOLCHAIN)
diff --git a/global.json b/global.json
index ac83b0fc7..eef65ada0 100644
--- a/global.json
+++ b/global.json
@@ -7,6 +7,6 @@
"xcopy-msbuild": "16.3.0-alpha"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20109.1"
+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20110.11"
}
}