diff --git a/rocclr/compiler/lib/backends/common/compiler_stage.hpp b/rocclr/compiler/lib/backends/common/compiler_stage.hpp
index e249782f49..6884f57d00 100644
--- a/rocclr/compiler/lib/backends/common/compiler_stage.hpp
+++ b/rocclr/compiler/lib/backends/common/compiler_stage.hpp
@@ -96,6 +96,7 @@ namespace amdcl
       void setUseNative(const char * Val) { if(Val) hookup_.amdoptions.OptUseNative = Val; }
       void setDenormsAreZero(bool Val) { hookup_.amdoptions.DenormsAreZero = Val; }
       void setUniformWorkGroupSize(bool Val) { hookup_.amdoptions.UniformWorkGroupSize = Val; }
+      void setHaveFastFMA32(bool Val) { hookup_.amdoptions.HaveFastFMA32 = Val; }
 
       /*! Returns the llvm binary */
       llvm::Module* LLVMBinary() const { return llvmbinary_; }
diff --git a/rocclr/compiler/lib/backends/common/linker.cpp b/rocclr/compiler/lib/backends/common/linker.cpp
index 9d10c42193..78429ceb8f 100644
--- a/rocclr/compiler/lib/backends/common/linker.cpp
+++ b/rocclr/compiler/lib/backends/common/linker.cpp
@@ -24,7 +24,6 @@
 #include "llvm/AMDFixupKernelModule.h"
 #include "llvm/AMDResolveLinker.h"
 #include "llvm/AMDPrelinkOpt.h"
-#include "llvm/AMDUtils.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Analysis/AMDLocalArrayUsage.h"
@@ -559,6 +558,7 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector<llvm::Module*> &libs)
   if (Options()->oVariables->EnableBuildTiming) {
     time_prelinkopt = amd::Os::timeNanos();
   }
+  llvm::StringRef chip(aclGetChip(Elf()->target));
   setGPU(IsGPUTarget);
   setFiniteMathOnly(Options()->oVariables->FiniteMathOnly);
   setNoSignedZeros(Options()->oVariables->NoSignedZeros);
@@ -571,6 +571,11 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector<llvm::Module*> &libs)
   setUseNative(Options()->oVariables->OptUseNative);
   setDenormsAreZero(Options()->oVariables->DenormsAreZero);
   setUniformWorkGroupSize(Options()->oVariables->UniformWorkGroupSize);
+  setHaveFastFMA32(chip == "Cypress"
+                || chip == "Cayman"
+                || chip == "Tahiti"
+                || chip == "Hawaii"
+                || chip == "Carrizo");
   LLVMBinary()->getContext().setAMDLLVMContextHook(&hookup_);
 
   std::string clp_errmsg;
@@ -602,9 +607,9 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector<llvm::Module*> &libs)
   }
 
   std::string ErrorMessage;
-
+#ifdef LEGACY_COMPLIB
   createASICIDFunctions(LLVMBinary());
-
+#endif // LEGACY_COMPLIB
   // Link libraries to get every functions that are referenced.
   std::string ErrorMsg;
   if (resolveLink(LLVMBinary(), LibMs, &ErrorMsg)) {