x86/x64: Call external symbols directly from interpreter code.

Except for ELF/x86 PIC, where it's easier to use wrappers.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/lj_vmmath.c b/src/lj_vmmath.c
index 63886aa7..b60858b2 100644
--- a/src/lj_vmmath.c
+++ b/src/lj_vmmath.c
@@ -13,15 +13,17 @@
 #include "lj_ir.h"
 #include "lj_vm.h"
 
-/* -- Helper functions for generated machine code ------------------------- */
+/* -- Wrapper functions --------------------------------------------------- */
 
-#if LJ_TARGET_X86ORX64
-/* Wrapper functions to avoid linker issues on OSX. */
-LJ_FUNCA double lj_vm_sinh(double x) { return sinh(x); }
-LJ_FUNCA double lj_vm_cosh(double x) { return cosh(x); }
-LJ_FUNCA double lj_vm_tanh(double x) { return tanh(x); }
+#if LJ_TARGET_X86 && __ELF__ && __PIC__
+/* Wrapper functions to deal with the ELF/x86 PIC disaster. */
+LJ_FUNCA double lj_wrap_sinh(double x) { return sinh(x); }
+LJ_FUNCA double lj_wrap_cosh(double x) { return cosh(x); }
+LJ_FUNCA double lj_wrap_tanh(double x) { return tanh(x); }
 #endif
 
+/* -- Helper functions for generated machine code ------------------------- */
+
 #if !LJ_TARGET_X86ORX64
 double lj_vm_foldarith(double x, double y, int op)
 {