Index: lib/Driver/ToolChains/Clang.cpp
===================================================================
--- lib/Driver/ToolChains/Clang.cpp
+++ lib/Driver/ToolChains/Clang.cpp
@@ -3213,7 +3213,11 @@
         CmdArgs.push_back("-P");
     }
   } else if (isa<AssembleJobAction>(JA)) {
-    CmdArgs.push_back("-emit-obj");
+    // AMDGCN does not support linking obj files.
+    if (IsHIP && Triple.getArch() == llvm::Triple::amdgcn)
+      CmdArgs.push_back("-emit-llvm-bc");
+    else
+      CmdArgs.push_back("-emit-obj");
 
     CollectArgsForIntegratedAssembler(C, Args, CmdArgs, D);