From 009830460b3549afb8720a1b99a8dae4a58f3a25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=B5=9C=EC=A2=85=ED=97=8C/Common=20Platform=20Lab=28SR=29?= =?utf8?q?/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Thu, 18 Jun 2020 18:49:01 +0900 Subject: [PATCH] Support for aarch64(arm64) build (#250) Change-Id: Iabaf37988ddbd44388f51defbe1e2e3642937c47 --- NativeLauncher/tool/ni_common.cc | 4 ++-- packaging/dotnet-launcher.spec | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/NativeLauncher/tool/ni_common.cc b/NativeLauncher/tool/ni_common.cc index a45043e..6e9af2f 100644 --- a/NativeLauncher/tool/ni_common.cc +++ b/NativeLauncher/tool/ni_common.cc @@ -465,7 +465,7 @@ static ni_error_e createCoreLibNI(DWORD flags) ni_error_e initNICommon(NICommonOption* option) { -#if defined(__arm__) +#if defined(__arm__) || defined(__aarch64__) // get interval value const static std::string intervalFile = concatPath(__NATIVE_LIB_DIR, "crossgen_interval.txt"); std::ifstream inFile(intervalFile); @@ -487,7 +487,7 @@ ni_error_e initNICommon(NICommonOption* option) return NI_ERROR_NONE; #else - fprintf(stderr, "crossgen supports arm architecture only. skip ni file generation\n"); + fprintf(stderr, "crossgen supports arm/arm64 architecture only. skip ni file generation\n"); return NI_ERROR_NOT_SUPPORTED; #endif } diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec index ea44e69..fb2a67c 100644 --- a/packaging/dotnet-launcher.spec +++ b/packaging/dotnet-launcher.spec @@ -63,8 +63,6 @@ Requires(preun): /usr/bin/systemctl %define _default_base_addr_start 0x3000000 -ExcludeArch: aarch64 - %description Launchpad plugin for launching dotnet apps -- 2.7.4