Prep for merging 3.4: Undo changes from 3.3 branch

include/llvm/MC/MCELFObjectWriter.h

 //===-- llvm/MC/MCELFObjectWriter.h - ELF Object Writer ---------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_MC_MCELFOBJECTWRITER_H
@@ skipping 27 matching lines @@
   ELFRelocationEntry()
     : r_offset(0), Index(0), Type(0), Symbol(0), r_addend(0), Fixup(0) {}
 
   ELFRelocationEntry(uint64_t RelocOffset, int Idx, unsigned RelType,
                      const MCSymbol *Sym, uint64_t Addend, const MCFixup &Fixup)
     : r_offset(RelocOffset), Index(Idx), Type(RelType), Symbol(Sym),
       r_addend(Addend), Fixup(&Fixup) {}
 
   // 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;
   }
 };
 
 class MCELFObjectTargetWriter {
   const uint8_t OSABI;
   const uint16_t EMachine;
   const unsigned HasRelocationAddend : 1;
   const unsigned Is64Bit : 1;
   const unsigned IsN64 : 1;
 
@@ skipping 86 matching lines @@
 /// \brief Construct a new ELF writer instance.
 ///
 /// \param MOTW - The target specific ELF writer subclass.
 /// \param OS - The stream to write to.
 /// \returns The constructed object writer.
 MCObjectWriter *createELFObjectWriter(MCELFObjectTargetWriter *MOTW,
                                       raw_ostream &OS, bool IsLittleEndian);
 } // End llvm namespace
 
 #endif