Index: lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
===================================================================
--- lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
+++ lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
@@ -197,8 +197,6 @@
   amd_kernel_code_t KernelCode;
   if (STM.isAmdCodeObjectV2(*MF)) {
     getAmdKernelCode(KernelCode, CurrentProgramInfo, *MF);
-
-    OutStreamer->SwitchSection(getObjFileLowering().getTextSection());
     getTargetStreamer()->EmitAMDKernelCodeT(KernelCode);
   }
 
Index: test/CodeGen/AMDGPU/comdat.ll
===================================================================
--- /dev/null
+++ test/CodeGen/AMDGPU/comdat.ll
@@ -0,0 +1,19 @@
+; RUN: llc -mtriple amdgcn-amd-amdhsa -filetype=obj <%s \
+; RUN:   | llvm-readobj -symbols - | FileCheck %s
+
+; CHECK: Name: func1
+; CHECK: Section: .text.func1
+
+; CHECK: Name: func2
+; CHECK: Section: .text.func2
+
+$func1 = comdat any
+$func2 = comdat any
+
+define amdgpu_kernel void @func1() local_unnamed_addr comdat {
+  ret void
+}
+
+define amdgpu_kernel void @func2() local_unnamed_addr comdat {
+  ret void
+}