Fixes

default.target.in

@@ -6,7 +6,7 @@ Target
 , tgtWordSize = WS@TargetWordSize@
 , tgtEndianness = @TargetEndianness@
 , tgtSymbolsHaveLeadingUnderscore = @LeadingUnderscoreBool@
-, tgtLlvmTarget = "@LlvmTarget@"
+, tgtLlvmTarget = "@LlvmTarget_CPP@"
 , tgtUnregisterised = @UnregisterisedBool@
 , tgtTablesNextToCode = @TablesNextToCodeBool@
 , tgtUseLibffiForAdjustors = @UseLibffiForAdjustorsBool@

utils/ghc-toolchain/src/GHC/Toolchain/Tools/MergeObjs.hs

@@ -23,7 +23,7 @@ newtype MergeObjs = MergeObjs { mergeObjsProgram :: Program
 
 findMergeObjs :: ProgOpt -> Cc -> CcLink -> Nm -> M MergeObjs
 findMergeObjs progOpt cc ccLink nm = checking "for linker for merging objects" $ do
-    prog <- findProgram "linker for merging objects" progOpt ["ld"]
+    prog <- findProgram "linker for merging objects" progOpt ["ld.gold", "ld"]
     let mo = MergeObjs $ over _prgFlags (++["-r"]) prog
     checkMergingWorks cc nm mo
     checkForGoldT22266 cc ccLink mo