From ac0e79e22b0eddc1dbbb5ecbea240f059e6be25c Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Thu, 4 Sep 2014 18:13:12 +0000 Subject: [PATCH] Win64: Add the uwtable attribute by default on Win64 Now that LLVM emits correct .pdata and .xdata for inline functions, we can reenable this. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@217178 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/WindowsToolChain.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/Driver/WindowsToolChain.cpp b/lib/Driver/WindowsToolChain.cpp index 913425a19f..ca4aa6780b 100644 --- a/lib/Driver/WindowsToolChain.cpp +++ b/lib/Driver/WindowsToolChain.cpp @@ -59,11 +59,10 @@ bool Windows::IsIntegratedAssemblerDefault() const { } bool Windows::IsUnwindTablesDefault() const { - // FIXME: LLVM's lowering of Win64 data is broken right now. MSVC's linker - // says that our object files provide invalid .pdata contributions. Until - // that is fixed, don't ask for unwind tables. - return false; - //return getArch() == llvm::Triple::x86_64; + // Emit unwind tables by default on Win64. All non-x86_32 Windows platforms + // such as ARM and PPC actually require unwind tables, but LLVM doesn't know + // how to generate them yet. + return getArch() == llvm::Triple::x86_64; } bool Windows::isPICDefault() const { -- 2.40.0