From 78901bd09ea1226e04f99886128d9dd7a70797e8 Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Sun, 2 Feb 2014 10:39:45 +0000
Subject: [PATCH] Revert r200555, r200545.

These changes make it impossible to use ARM EHABI for stack unwinding without
enabling exceptions and break AddressSanitizer on ARM.

llvm-svn: 200627
---
 clang/lib/Driver/Tools.cpp           | 9 ---------
 clang/test/Driver/arm-no-exception.c | 4 ----
 2 files changed, 13 deletions(-)
 delete mode 100644 clang/test/Driver/arm-no-exception.c

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index fafb95155dd1..0be232f15c89 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -830,15 +830,6 @@ void Clang::AddARMTargetArgs(const ArgList &Args,
       CmdArgs.push_back("-backend-option");
       CmdArgs.push_back("-arm-reserve-r9");
     }
-
-    // Exception handling
-    if (Arg *A = Args.getLastArg(options::OPT_fexceptions,
-                                 options::OPT_fno_exceptions)) {
-      if (A->getOption().matches(options::OPT_fno_exceptions)) {
-        CmdArgs.push_back("-backend-option");
-        CmdArgs.push_back("-arm-disable-ehabi");
-      }
-    }
 }
 
 // Get CPU and ABI names. They are not independent
diff --git a/clang/test/Driver/arm-no-exception.c b/clang/test/Driver/arm-no-exception.c
deleted file mode 100644
index 6c6036e06ca9..000000000000
--- a/clang/test/Driver/arm-no-exception.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %clang -target arm-none-gnueeabi -fno-exceptions -### %s 2> %t
-// RUN: FileCheck --check-prefix=CHECK-NOEH < %t %s
-
-// CHECK-NOEH: "-backend-option" "-arm-disable-ehabi"