diff options
| -rw-r--r-- | llvm/docs/ReleaseNotes.rst | 2 | ||||
| -rw-r--r-- | llvm/include/llvm/CodeGen/CommandFlags.h | 3 | ||||
| -rw-r--r-- | llvm/test/CodeGen/SPARC/exception.ll | 34 | ||||
| -rw-r--r-- | llvm/tools/llc/llc.cpp | 3 |
4 files changed, 2 insertions, 40 deletions
diff --git a/llvm/docs/ReleaseNotes.rst b/llvm/docs/ReleaseNotes.rst index 723e7cf39e5..89980722e27 100644 --- a/llvm/docs/ReleaseNotes.rst +++ b/llvm/docs/ReleaseNotes.rst @@ -52,6 +52,8 @@ Non-comprehensive list of changes in this release * llvm-ar now handles IR files like regular object files. In particular, a regular symbol table is created for symbols defined in IR files. +* llvm now requires assemblers that support cfi directives. + .. NOTE For small 1-3 sentence descriptions, just add an entry at the end of this list. If your description won't fit comfortably in one bullet diff --git a/llvm/include/llvm/CodeGen/CommandFlags.h b/llvm/include/llvm/CodeGen/CommandFlags.h index 3062fba11fd..619826cf622 100644 --- a/llvm/include/llvm/CodeGen/CommandFlags.h +++ b/llvm/include/llvm/CodeGen/CommandFlags.h @@ -87,9 +87,6 @@ FileType("filetype", cl::init(TargetMachine::CGFT_AssemblyFile), "Emit nothing, for performance testing"), clEnumValEnd)); -cl::opt<bool> DisableCFI("disable-cfi", cl::Hidden, - cl::desc("Do not use .cfi_* directives")); - cl::opt<bool> EnableDwarfDirectory("enable-dwarf-directory", cl::Hidden, cl::desc("Use .file directives with an explicit directory.")); diff --git a/llvm/test/CodeGen/SPARC/exception.ll b/llvm/test/CodeGen/SPARC/exception.ll index 3a3f59f1388..eca9c8bf739 100644 --- a/llvm/test/CodeGen/SPARC/exception.ll +++ b/llvm/test/CodeGen/SPARC/exception.ll @@ -1,9 +1,7 @@ ; RUN: llc < %s -march=sparc -relocation-model=static | FileCheck -check-prefix=V8ABS %s ; RUN: llc < %s -march=sparc -relocation-model=pic | FileCheck -check-prefix=V8PIC %s -; RUN: llc < %s -march=sparc -relocation-model=pic -disable-cfi | FileCheck -check-prefix=V8PIC_NOCFI %s ; RUN: llc < %s -march=sparcv9 -relocation-model=static | FileCheck -check-prefix=V9ABS %s ; RUN: llc < %s -march=sparcv9 -relocation-model=pic | FileCheck -check-prefix=V9PIC %s -; RUN: llc < %s -march=sparcv9 -relocation-model=pic -disable-cfi | FileCheck -check-prefix=V9PIC_NOCFI %s %struct.__fundamental_type_info_pseudo = type { %struct.__type_info_pseudo } @@ -47,22 +45,6 @@ ; V8PIC: .L_ZTIi.DW.stub: ; V8PIC-NEXT: .word _ZTIi -; V8PIC_NOCFI-LABEL: main: -; V8PIC_NOCFI: .section .gcc_except_table -; V8PIC_NOCFI-NOT: .section -; V8PIC_NOCFI: .word %r_disp32(.L_ZTIi.DW.stub) -; V8PIC_NOCFI: .data -; V8PIC_NOCFI: .L_ZTIi.DW.stub: -; V8PIC_NOCFI-NEXT: .word _ZTIi -; V8PIC_NOCFI: .section .eh_frame -; V8PIC_NOCFI-NOT: .section -; V8PIC_NOCFI: .byte 15 ! CIE Return Address Column -; V8PIC_NOCFI: .word %r_disp32(DW.ref.__gxx_personality_v0) -; V8PIC_NOCFI: .byte 12 ! DW_CFA_def_cfa -; V8PIC_NOCFI: .byte 14 ! Reg 14 -; V8PIC_NOCFI-NEXT: .byte 0 ! Offset 0 -; V8PIC_NOCFI: .word %r_disp32(.Ltmp{{.+}}) ! FDE initial location - ; V9ABS-LABEL: main: ; V9ABS: .cfi_startproc @@ -89,22 +71,6 @@ ; V9PIC: .L_ZTIi.DW.stub: ; V9PIC-NEXT: .xword _ZTIi -; V9PIC_NOCFI-LABEL: main: -; V9PIC_NOCFI: .section .gcc_except_table -; V9PIC_NOCFI-NOT: .section -; V9PIC_NOCFI: .word %r_disp32(.L_ZTIi.DW.stub) -; V9PIC_NOCFI: .data -; V9PIC_NOCFI: .L_ZTIi.DW.stub: -; V9PIC_NOCFI-NEXT: .xword _ZTIi -; V9PIC_NOCFI: .section .eh_frame -; V9PIC_NOCFI-NOT: .section -; V9PIC_NOCFI: .byte 15 ! CIE Return Address Column -; V9PIC_NOCFI: .word %r_disp32(DW.ref.__gxx_personality_v0) -; V9PIC_NOCFI: .byte 12 ! DW_CFA_def_cfa -; V9PIC_NOCFI-NEXT: .byte 14 ! Reg 14 -; V9PIC_NOCFI: .ascii "\377\017" ! Offset 2047 -; V9PIC_NOCFI: .word %r_disp32(.Ltmp{{.+}}) ! FDE initial location - define i32 @main(i32 %argc, i8** nocapture readnone %argv) unnamed_addr #0 { entry: %0 = icmp eq i32 %argc, 2 diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp index 6ddda204410..654a9c3eeea 100644 --- a/llvm/tools/llc/llc.cpp +++ b/llvm/tools/llc/llc.cpp @@ -280,9 +280,6 @@ static int compileModule(char **argv, LLVMContext &Context) { assert(mod && "Should have exited after outputting help!"); TargetMachine &Target = *target.get(); - if (DisableCFI) - Target.setMCUseCFI(false); - if (EnableDwarfDirectory) Target.setMCUseDwarfDirectory(true); |
