Revert r200555, r200545.

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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200627 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index fafb95155dd15ae59cd5c6efdf92fe3ead1496ab..0be232f15c89216417241350ba338d07f5c513b2 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/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/test/Driver/arm-no-exception.c b/test/Driver/arm-no-exception.c
deleted file mode 100644 (file)
index 6c6036e..0000000
--- a/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"