| Index: lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
 | 
| diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
 | 
| index c0037f65dbff0742cec15a29b07786a2b103ba88..6a3ec8fcc48679d52f8c8bc3bff05f60d475bda2 100644
 | 
| --- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
 | 
| +++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
 | 
| @@ -11,7 +11,6 @@
 | 
|  //
 | 
|  //===----------------------------------------------------------------------===//
 | 
|  
 | 
| -#include "ARMMCTargetDesc.h"
 | 
|  #include "ARMBaseInfo.h"
 | 
|  #include "ARMMCAsmInfo.h"
 | 
|  #include "ARMMCTargetDesc.h"
 | 
| @@ -237,15 +236,8 @@ static MCAsmInfo *createARMMCAsmInfo(const MCRegisterInfo &MRI, StringRef TT) {
 | 
|    default:
 | 
|      if (TheTriple.isOSBinFormatMachO())
 | 
|        MAI = new ARMMCAsmInfoDarwin(TT);
 | 
| -  // @LOCALMOD-BEGIN
 | 
| -    else {
 | 
| -      ARMELFMCAsmInfo *AEMAI = new ARMELFMCAsmInfo(TT);
 | 
| -      if (TheTriple.isOSNaCl())
 | 
| -        // NativeClient uses Dwarf exception handling
 | 
| -        AEMAI->setExceptionsType(ExceptionHandling::DwarfCFI);
 | 
| -      MAI = AEMAI;
 | 
| -    }
 | 
| -  // @LOCALMOD-END
 | 
| +    else
 | 
| +      MAI = new ARMELFMCAsmInfo(TT);
 | 
|      break;
 | 
|    }
 | 
|  
 | 
| 
 |