From 930a25a7beeaf7786b2574e5113af9d92c42feaa Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200627 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 9 --------- test/Driver/arm-no-exception.c | 4 ---- 2 files changed, 13 deletions(-) delete mode 100644 test/Driver/arm-no-exception.c diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index fafb95155d..0be232f15c 100644 --- 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 index 6c6036e06c..0000000000 --- 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" -- 2.40.0