maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang] [MinGW] Default to WinEH (SEH) exception handling instead of Dwarf 

The relevant runtime libraries have been updated to support this
now.

Differential Revision: https://reviews.llvm.org/D126871
This commit is contained in:
Martin Storsjö 2022-05-03 17:45:36 +03:00
parent 98dc3e86fd
commit fcb784db49
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Driver/ToolChains/MinGW.cpp
View File

@ -478,8 +478,8 @@ bool toolchains::MinGW::IsUnwindTablesDefault(const ArgList &Args) const {
if (ExceptionArg &&
ExceptionArg->getOption().matches(options::OPT_fseh_exceptions))
return true;
return getArch() == llvm::Triple::x86_64 ||
getArch() == llvm::Triple::aarch64;
return getArch() == llvm::Triple::x86_64 || getArch() == llvm::Triple::arm ||
getArch() == llvm::Triple::thumb || getArch() == llvm::Triple::aarch64;
}
bool toolchains::MinGW::isPICDefault() const {
@ -495,7 +495,8 @@ bool toolchains::MinGW::isPICDefaultForced() const { return true; }
llvm::ExceptionHandling
toolchains::MinGW::GetExceptionModel(const ArgList &Args) const {
if (getArch() == llvm::Triple::x86_64 || getArch() == llvm::Triple::aarch64)
if (getArch() == llvm::Triple::x86_64 || getArch() == llvm::Triple::aarch64 ||
getArch() == llvm::Triple::arm || getArch() == llvm::Triple::thumb)
return llvm::ExceptionHandling::WinEH;
return llvm::ExceptionHandling::DwarfCFI;
}

2
clang/test/Driver/windows-exceptions.cpp
View File

@ -4,6 +4,8 @@
// RUN: %clang -target aarch64-windows-msvc -c %s -### 2>&1 | FileCheck -check-prefix=MSVC -check-prefix=MSVC-SEH %s
// RUN: %clang -target i686-windows-gnu -c %s -### 2>&1 | FileCheck -check-prefix=MINGW-DWARF %s
// RUN: %clang -target x86_64-windows-gnu -c %s -### 2>&1 | FileCheck -check-prefix=MINGW-SEH %s
// RUN: %clang -target armv7-windows-gnu -fdwarf-exceptions -c %s -### 2>&1 | FileCheck -check-prefix=MINGW-DWARF %s
// RUN: %clang -target armv7-windows-gnu -c %s -### 2>&1 | FileCheck -check-prefix=MINGW-SEH %s
// RUN: %clang -target aarch64-windows-gnu -fdwarf-exceptions -c %s -### 2>&1 | FileCheck -check-prefix=MINGW-DWARF %s
// RUN: %clang -target aarch64-windows-gnu -c %s -### 2>&1 | FileCheck -check-prefix=MINGW-SEH %s