Remove -arm-disable-ehabi option

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200988 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Renato Golin 2014-02-07 20:12:49 +00:00
parent 1e75dec97a
commit 703197fc94
5 changed files with 20 additions and 20 deletions

View File

@ -1104,8 +1104,6 @@ void ARMAsmPrinter::EmitUnwindingInstruction(const MachineInstr *MI) {
} }
} }
extern cl::opt<bool> DisableARMEHABI;
// Simple pseudo-instructions have their lowering (with expansion to real // Simple pseudo-instructions have their lowering (with expansion to real
// instructions) auto-generated. // instructions) auto-generated.
#include "ARMGenMCPseudoLowering.inc" #include "ARMGenMCPseudoLowering.inc"
@ -1120,7 +1118,7 @@ void ARMAsmPrinter::EmitInstruction(const MachineInstr *MI) {
} }
// Emit unwinding stuff for frame-related instructions // Emit unwinding stuff for frame-related instructions
if (Subtarget->isTargetEHABICompatible() && !DisableARMEHABI && if (Subtarget->isTargetEHABICompatible() &&
MI->getFlag(MachineInstr::FrameSetup)) MI->getFlag(MachineInstr::FrameSetup))
EmitUnwindingInstruction(MI); EmitUnwindingInstruction(MI);

View File

@ -16,14 +16,6 @@
using namespace llvm; using namespace llvm;
// ARM EHABI is experimental but the quality is good enough
// to be turned on by default on non-Darwin ARM targets.
cl::opt<bool>
DisableARMEHABI("arm-disable-ehabi", cl::Hidden,
cl::desc("Disable ARM experimental exception handling"),
cl::init(false));
void ARMMCAsmInfoDarwin::anchor() { } void ARMMCAsmInfoDarwin::anchor() { }
ARMMCAsmInfoDarwin::ARMMCAsmInfoDarwin() { ARMMCAsmInfoDarwin::ARMMCAsmInfoDarwin() {
@ -54,7 +46,6 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo() {
SupportsDebugInformation = true; SupportsDebugInformation = true;
// Exceptions handling // Exceptions handling
if (!DisableARMEHABI)
ExceptionsType = ExceptionHandling::ARM; ExceptionsType = ExceptionHandling::ARM;
// foo(plt) instead of foo@plt // foo(plt) instead of foo@plt

View File

@ -1,7 +1,8 @@
; RUN: llc < %s -mcpu=cortex-a8 -march=arm -asm-verbose=false -arm-disable-ehabi | FileCheck %s ; RUN: llc < %s -mcpu=cortex-a8 -march=arm -asm-verbose=false | FileCheck %s
define zeroext i1 @test0(i32 %x) nounwind { define zeroext i1 @test0(i32 %x) nounwind {
; CHECK-LABEL: test0: ; CHECK-LABEL: test0:
; CHECK-NEXT: .fnstart
; CHECK-NEXT: add [[REG:(r[0-9]+)|(lr)]], r0, #1 ; CHECK-NEXT: add [[REG:(r[0-9]+)|(lr)]], r0, #1
; CHECK-NEXT: mov r0, #0 ; CHECK-NEXT: mov r0, #0
; CHECK-NEXT: cmp [[REG]], #1 ; CHECK-NEXT: cmp [[REG]], #1

View File

@ -1,7 +1,7 @@
; RUN: llc < %s -march=arm -mcpu=cortex-a8 -O0 -filetype=obj -o %t.o -arm-disable-ehabi ; RUN: llc < %s -march=arm -mcpu=cortex-a8 -O0 -filetype=obj -o %t.o
; RUN: llc < %s -march=thumb -mcpu=cortex-a8 -O0 -filetype=obj -o %t.o -arm-disable-ehabi ; RUN: llc < %s -march=thumb -mcpu=cortex-a8 -O0 -filetype=obj -o %t.o
; RUN: llc < %s -march=arm -mcpu=cortex-a8 -O2 -filetype=obj -verify-machineinstrs -o %t.o -arm-disable-ehabi ; RUN: llc < %s -march=arm -mcpu=cortex-a8 -O2 -filetype=obj -verify-machineinstrs -o %t.o
; RUN: llc < %s -march=thumb -mcpu=cortex-a8 -O2 -filetype=obj -verify-machineinstrs -o %t.o -arm-disable-ehabi ; RUN: llc < %s -march=thumb -mcpu=cortex-a8 -O2 -filetype=obj -verify-machineinstrs -o %t.o
target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:32:64-v128:32:128-a0:0:32-n32-S32" target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:32:64-v128:32:128-a0:0:32-n32-S32"
target triple = "thumbv7-apple-ios" target triple = "thumbv7-apple-ios"

View File

@ -1,8 +1,8 @@
;; RUN: llc -O0 -verify-machineinstrs -fast-isel-abort -arm-disable-ehabi \ ;; RUN: llc -O0 -verify-machineinstrs -fast-isel-abort \
;; RUN: -mtriple=armv7-linux-gnueabi -filetype=obj %s -o - | \ ;; RUN: -mtriple=armv7-linux-gnueabi -filetype=obj %s -o - | \
;; RUN: llvm-readobj -t | FileCheck -check-prefix=ARM %s ;; RUN: llvm-readobj -t | FileCheck -check-prefix=ARM %s
;; RUN: llc -O0 -verify-machineinstrs -fast-isel-abort -arm-disable-ehabi \ ;; RUN: llc -O0 -verify-machineinstrs -fast-isel-abort \
;; RUN: -mtriple=thumbv7-linux-gnueabi -filetype=obj %s -o - | \ ;; RUN: -mtriple=thumbv7-linux-gnueabi -filetype=obj %s -o - | \
;; RUN: llvm-readobj -t | FileCheck -check-prefix=TMB %s ;; RUN: llvm-readobj -t | FileCheck -check-prefix=TMB %s
@ -144,6 +144,16 @@ exit:
;; ARM-NEXT: Other: ;; ARM-NEXT: Other:
;; ARM-NEXT: Section: [[MIXED_SECT]] ;; ARM-NEXT: Section: [[MIXED_SECT]]
;; ARM: Symbol {
;; ARM: Name: $d
;; ARM-NEXT: Value: 0x0
;; ARM-NEXT: Size: 0
;; ARM-NEXT: Binding: Local (0x0)
;; ARM-NEXT: Type: None (0x0)
;; ARM-NEXT: Other: 0
;; ARM-NEXT: Section: .ARM.exidx
;; ARM-NEXT: }
;; ARM-NOT: ${{[atd]}} ;; ARM-NOT: ${{[atd]}}
;; TMB: Symbol { ;; TMB: Symbol {