[pkg-d-commits] [ldc] 147/211: Win64: Don't enforce uwtable function attribute

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.1.0
in repository ldc.

commit b7c2a30950bf7721efc92266567df0d7ad206cd2
Author: Martin <noone at nowhere.com>
Date:   Wed Oct 26 15:28:50 2016 +0200

    Win64: Don't enforce uwtable function attribute
---
 gen/functions.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen/functions.cpp b/gen/functions.cpp
index 44328e3..e7f28f7 100644
--- a/gen/functions.cpp
+++ b/gen/functions.cpp
@@ -930,8 +930,8 @@ void DtoDefineFunction(FuncDeclaration *fd, bool linkageAvailableExternally) {
 
   // On x86_64, always set 'uwtable' for System V ABI compatibility.
   // TODO: Find a better place for this.
-  // TODO: Is this required for Win64 as well?
-  if (global.params.targetTriple->getArch() == llvm::Triple::x86_64) {
+  if (global.params.targetTriple->getArch() == llvm::Triple::x86_64 &&
+      !global.params.isWindows) {
     func->addFnAttr(LLAttribute::UWTable);
   }
   if (opts::sanitize != opts::None) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git