From 782dd77110d6ea17f46f4d29bc95f5d974904cd3 Mon Sep 17 00:00:00 2001
From: Kai Nacke <kai@redstar.de>
Date: Tue, 22 Mar 2016 19:31:29 +0100
Subject: [PATCH] Fix merge error

---
 gen/llvmhelpers.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gen/llvmhelpers.cpp b/gen/llvmhelpers.cpp
index 3349c4dc3f..4ed695e897 100644
--- a/gen/llvmhelpers.cpp
+++ b/gen/llvmhelpers.cpp
@@ -1809,9 +1809,3 @@ unsigned getFieldGEPIndex(AggregateDeclaration *ad, VarDeclaration *vd) {
   assert(byteOffset == 0 && "Cannot address field by a simple GEP.");
   return fieldIndex;
 }
-
-#if LDC_LLVM_VER >= 307
-bool supportsCOMDAT() {
-  return !global.params.targetTriple->isOSBinFormatMachO();
-}
-#endif