Merge pull request #2983 from nbhuiyan/create-linkage-osx

OSX: Enable x86_64 linkage creation in CodeGenerator
eclipse-openj9 · Sep 25, 2018 · c1463b8 · c1463b8
2 parents 854b625 + 7e99760
commit c1463b8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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());
             }