Prep for merging 3.4: Undo changes from 3.3 branch

include/llvm/MC/MCELFObjectWriter.h

Index: include/llvm/MC/MCELFObjectWriter.h
diff --git a/include/llvm/MC/MCELFObjectWriter.h b/include/llvm/MC/MCELFObjectWriter.h
index 65dd1e8998cc657474f0e89a7c2dca12de4302e5..a59776d5cdaac31656ebcd159e08bb6bbadbe489 100644
--- a/include/llvm/MC/MCELFObjectWriter.h
+++ b/include/llvm/MC/MCELFObjectWriter.h
@@ -45,14 +45,7 @@ struct ELFRelocationEntry {
 
   // Support lexicographic sorting.
   bool operator<(const ELFRelocationEntry &RE) const {
-    if (RE.r_offset != r_offset)
-      return RE.r_offset < r_offset;
-    if (Type != RE.Type)
-      return Type < RE.Type;
-    if (Index != RE.Index)
-      return Index < RE.Index;
-    llvm_unreachable("ELFRelocs might be unstable!");
-    return 0;
+    return RE.r_offset < r_offset;
   }
 };