openharmony/ark_runtime_core
1
0
Fork 0
mirror of https://github.com/openharmony/ark_runtime_core.git synced 2026-07-16 08:55:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

!101 Temporarily fix compilation error when using unsupported arm float abi type

Browse Source 
Merge pull request !101 from 胡晓炜/master
This commit is contained in:
openharmony_ci
2022-03-15 12:52:01 +00:00
committed by Gitee
parent be2767800e 0b36ae4a55
commit f63fdf034d
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/BUILD.gn
+18 -2
View File
@@ -12,6 +12,7 @@
# limitations under the License.
import("//ark/runtime_core/ark_config.gni")
import("//build/config/arm.gni")
import("//build/ohos.gni")
import("$ark_root/verification/verification.gni")
@@ -159,11 +160,26 @@ ohos_static_library("libarkruntime_static") {
if (current_cpu == "arm") {
sources += [
"arch/arm/interpreter_support.S",
"bridge/arch/arm/compiled_code_to_interpreter_bridge_arm.S",
"bridge/arch/arm/compiled_code_to_interpreter_bridge_dyn_arm.S",
"bridge/arch/arm/interpreter_to_compiled_code_bridge_arm.S",
"bridge/arch/arm/interpreter_to_compiled_code_bridge_dyn_arm.S",
]
if (arm_float_abi == "softfp") {
sources += [
"bridge/arch/arm/compiled_code_to_interpreter_bridge_arm.S",
"bridge/arch/arm/interpreter_to_compiled_code_bridge_arm.S",
]
} else if (arm_float_abi == "hard") {
sources += [
"bridge/arch/arm/compiled_code_to_interpreter_bridge_armhf.S",
"bridge/arch/arm/interpreter_to_compiled_code_bridge_armhf.S",
]
} else {
print("Unsupported arm float abi type")
sources += [
"bridge/arch/arm/compiled_code_to_interpreter_bridge_armsf.S",
"bridge/arch/arm/interpreter_to_compiled_code_bridge_arm.S",
]
}
} else if (current_cpu == "arm64") {
sources += [
"arch/aarch64/interpreter_support.S",
runtime/bridge/arch/arm/compiled_code_to_interpreter_bridge_armsf.S
+33
View File
@@ -0,0 +1,33 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "arch/asm_support.h"
#include "arch/arm/shorty.S"
#include "shorty_values.h"
#define SHORTY_PTR_REG DEFAULT_SHORTY_PTR_REG
#define SHORTY_REG DEFAULT_SHORTY_REG
// Frame* CreateFrameForMethod(Method* method, Frame* prev);
.extern CreateFrameForMethod
// void InterpreterEntryPoint(Method *method, Frame* frame);
.extern InterpreterEntryPoint
// bool IncrementHotnessCounter(Method *method);
.extern IncrementHotnessCounter
.global CompiledCodeToInterpreterBridge
.type CompiledCodeToInterpreterBridge, %function
CompiledCodeToInterpreterBridge:
// Not implemented yet