From 8adb1aa6faf8b6468542187f4173d6205026bb80 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Wed, 18 Dec 2019 18:18:09 +0700 Subject: [PATCH] [Interop][watchos_arm64] Exclude arm32-specific functions from platform libs --- platformLibs/src/platform/watchos/darwin.def | 6 ++++++ platformLibs/src/platform/watchos/objc.def | 3 +++ 2 files changed, 9 insertions(+) diff --git a/platformLibs/src/platform/watchos/darwin.def b/platformLibs/src/platform/watchos/darwin.def index 6e12bedba17..a4cdc2b228b 100644 --- a/platformLibs/src/platform/watchos/darwin.def +++ b/platformLibs/src/platform/watchos/darwin.def @@ -33,6 +33,12 @@ excludedFunctions = __tg_promote KERNEL_AUDIT_TOKEN KERNEL_SECURITY_TOKEN \ asl_decode_buffer asl_encode_buffer asl_remove_index \ averunnable dbm_forder pidlock ttyaction ttylock ttymsg ttyunlock uuid_generate_early_random +# These functions are depend on __arm__ macro. Include them back +# when our LLVM distribution will gain support for arm64_32 target. +excludedFunctions.watchos_arm64 = _simd_ceil_f4 _simd_ceil_d2 _simd_floor_f4 _simd_floor_d2 \ + _simd_rint_f4 _simd_rint_d2 _simd_trunc_f4 _simd_trunc_d2 \ + __tg_trunc __tg_ceil __tg_rint __tg_floor simd_fract + compilerOpts = -D_XOPEN_SOURCE -DSYSCTL_DEF_ENABLED linkerOpts = -ldl -lz -lbz2 -lcompression diff --git a/platformLibs/src/platform/watchos/objc.def b/platformLibs/src/platform/watchos/objc.def index 614953bfb0d..1e893b1354e 100644 --- a/platformLibs/src/platform/watchos/objc.def +++ b/platformLibs/src/platform/watchos/objc.def @@ -6,6 +6,9 @@ headers = objc/NSObjCRuntime.h objc/NSObject.h objc/message.h objc/objc-api.h \ headerFilter = objc/** +excludedFunctions.watchos_arm64 = _objc_msgForward_stret \ + class_getMethodImplementation_stret method_invoke_stret + compilerOpts = -D_XOPEN_SOURCE -DOBJC_OLD_DISPATCH_PROTOTYPES=1 linkerOpts = -lobjc