Index: lib/CodeGen/TargetLoweringObjectFileImpl.cpp
===================================================================
--- lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -34,7 +34,6 @@
 #include "llvm/MC/MCSymbolELF.h"
 #include "llvm/MC/MCValue.h"
 #include "llvm/ProfileData/InstrProf.h"
-#include "llvm/ProfileData/ProfileCommon.h"
 #include "llvm/Support/COFF.h"
 #include "llvm/Support/Dwarf.h"
 #include "llvm/Support/ELF.h"
@@ -245,11 +244,6 @@
   return ".data.rel.ro";
 }
 
-static cl::opt<bool> GroupFunctionsByHotness(
-    "group-functions-by-hotness",
-    llvm::cl::desc("Partition hot/cold functions by sections prefix"),
-    cl::init(false));
-
 static MCSectionELF *
 selectELFSectionForGlobal(MCContext &Ctx, const GlobalValue *GV,
                           SectionKind Kind, Mangler &Mang,
@@ -301,16 +295,8 @@
   } else {
     Name = getSectionPrefixForGlobal(Kind);
   }
-
-  if (GroupFunctionsByHotness) {
-    if (const Function *F = dyn_cast<Function>(GV)) {
-      if (ProfileSummary::isFunctionHot(F)) {
-        Name += getHotSectionPrefix();
-      } else if (ProfileSummary::isFunctionUnlikely(F)) {
-        Name += getUnlikelySectionPrefix();
-      }
-    }
-  }
+  // FIXME: Extend the section prefix to include hotness catagories such as .hot
+  //  or .unlikely for functions.
 
   if (EmitUniqueSection && UniqueSectionNames) {
     Name.push_back('.');
Index: test/CodeGen/X86/partition-sections.ll
===================================================================
--- test/CodeGen/X86/partition-sections.ll
+++ /dev/null
@@ -1,31 +0,0 @@
-; RUN: llc < %s -mtriple=x86_64-pc-linux -group-functions-by-hotness=true | FileCheck %s -check-prefix=PARTITION
-; RUN: llc < %s -mtriple=x86_64-pc-linux -function-sections -group-functions-by-hotness=false | FileCheck %s -check-prefix=NO-PARTITION-FUNCTION-SECTION
-; RUN: llc < %s -mtriple=x86_64-pc-linux -function-sections -group-functions-by-hotness=true | FileCheck %s -check-prefix=PARTITION-FUNCTION-SECTION
-
-; PARTITION: .text.unlikely
-; PARTITION: .globl  _Z3foov
-; NO-PARTITION-FUNCTION-SECTION: .text._Z3foov
-; PARTITION-FUNCTION-SECTION: .text.unlikely._Z3foov
-define i32 @_Z3foov() #0 {
-  ret i32 0
-}
-
-; PARTITION: .globl  _Z3barv
-; NO-PARTITION-FUNCTION-SECTION: .text._Z3barv
-; PARTITION-FUNCTION-SECTION: .text.unlikely._Z3barv
-define i32 @_Z3barv() #1 !prof !0 {
-  ret i32 1
-}
-
-; PARTITION: .text
-; PARTITION: .globl  _Z3bazv
-; NO-PARTITION-FUNCTION-SECTION: .text._Z3bazv
-; PARTITION-FUNCTION-SECTION: .text._Z3bazv
-define i32 @_Z3bazv() #1 {
-  ret i32 2
-}
-
-attributes #0 = { nounwind uwtable cold }
-attributes #1 = { nounwind uwtable }
-
-!0 = !{!"function_entry_count", i64 0}