From 7e9976042abf8dfa80ab4da21d7c268123713509 Mon Sep 17 00:00:00 2001 From: Nazim Uddin Bhuiyan Date: Wed, 19 Sep 2018 17:53:58 -0400 Subject: [PATCH] Enable linkage creation on OSX in CodeGenerator Signed-off-by: Nazim Uddin Bhuiyan --- runtime/compiler/x/amd64/codegen/J9CodeGenerator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/compiler/x/amd64/codegen/J9CodeGenerator.cpp b/runtime/compiler/x/amd64/codegen/J9CodeGenerator.cpp index 1da48e98c9c..df4a1a5de7e 100644 --- a/runtime/compiler/x/amd64/codegen/J9CodeGenerator.cpp +++ b/runtime/compiler/x/amd64/codegen/J9CodeGenerator.cpp @@ -66,7 +66,7 @@ J9::X86::AMD64::CodeGenerator::createLinkage(TR_LinkageConventions lc) systemLinkage = new (self()->trHeapMemory()) TR::AMD64J9Win64FastCallLinkage(self()); linkage = new (self()->trHeapMemory()) TR::AMD64JNILinkage(systemLinkage, self()); } - else if (TR::Compiler->target.isLinux()) + else if (TR::Compiler->target.isLinux() || TR::Compiler->target.isOSX()) { systemLinkage = new (self()->trHeapMemory()) TR::AMD64J9ABILinkage(self()); linkage = new (self()->trHeapMemory()) TR::AMD64JNILinkage(systemLinkage, self()); @@ -84,7 +84,7 @@ J9::X86::AMD64::CodeGenerator::createLinkage(TR_LinkageConventions lc) { linkage = new (self()->trHeapMemory()) TR::AMD64J9Win64FastCallLinkage(self()); } - else if (TR::Compiler->target.isLinux()) + else if (TR::Compiler->target.isLinux() || TR::Compiler->target.isOSX()) { linkage = new (self()->trHeapMemory()) TR::AMD64J9ABILinkage(self()); }