Changeset 1347:3647bef175d7

Timestamp:

05/12/09 10:02:51 (3 years ago)

Author:

Frits van Bommel <fvbommel wxs.nl>

branch:

default

Message:

Remove some other code that tested for LLVM before r67588.

Files:

• gen/linkage.h (modified) (2 diffs)
• gen/main.cpp (modified) (2 diffs)
• gen/tollvm.cpp (modified) (1 diff)

gen/linkage.h

@@ -2 +2 @@
-#define LDC_GEN_LINKAGE_H
-
-
+
-
-// Make it easier to test new linkage types
-// Also used to adapt to some changes in LLVM between 2.5 and 2.6
-
-
-// LLVM r66339 introduces LinkOnceODRLinkage, which is just what we want here.
-// (It also renamed LinkOnceLinkage, so this #if is needed for LDC to compile
-// with both 2.5 and trunk)
-#if LLVM_REV >= 66339
-#  define TEMPLATE_LINKAGE_TYPE         llvm::GlobalValue::LinkOnceODRLinkage
-#  define TYPEINFO_LINKAGE_TYPE         llvm::GlobalValue::LinkOnceODRLinkage
@@ -18 +10 @@
-                                        llvm::GlobalValue::LinkOnceAnyLinkage
-
-// For 2.5 and any LLVM revision before 66339 we want to use LinkOnceLinkage
-// It's equivalent to LinkOnceAnyLinkage in trunk except that the inliner had a
-// hack (removed in r66339) to allow inlining of templated functions even though
-// LinkOnce doesn't technically allow that.
-#else
-#  define TEMPLATE_LINKAGE_TYPE         llvm::GlobalValue::LinkOnceLinkage
-#  define TYPEINFO_LINKAGE_TYPE         llvm::GlobalValue::LinkOnceLinkage
-#  define DEBUGINFO_LINKONCE_LINKAGE_TYPE \
-                                        llvm::GlobalValue::LinkOnceLinkage
-#endif
-
-#endif

gen/main.cpp

@@ -38 +38 @@
-#include "gen/toobj.h"
-#include "gen/passes/Passes.h"
-#include "gen/llvm-version.h"
-
-#include "gen/cl_options.h"
@@ -882 +881 @@
-        }
-        
-#if LLVM_REV < 66404
-        // Workaround for llvm bug #3749
-        // Not needed since LLVM r66404 (it no longer checks for this)
-        llvm::GlobalVariable* ctors = linker.getModule()->getGlobalVariable("llvm.global_ctors");
-        if (ctors) {
-            ctors->removeDeadConstantUsers();
-            assert(ctors->use_empty());
-        }
-#endif
-        
-        m->deleteObjFile();
-        writeModule(linker.getModule(), filename);

gen/tollvm.cpp

@@ -544 +544 @@
-    else if(llty == LLType::X86_FP80Ty) {
-        uint64_t bits[] = {0, 0};
-    #if LLVM_REV < 67562
-        // Prior to r67562, the i80 APInt format expected by the APFloat
-        // constructor was different than the memory layout on the actual
-        // processor.
-        bits[1] = *(uint16_t*)&value;
-        bits[0] = *(uint64_t*)((uint16_t*)&value + 1);
-    #else
-        bits[0] = *(uint64_t*)&value;
-        bits[1] = *(uint16_t*)((uint64_t*)&value + 1);
-    #endif
-        return LLConstantFP::get(APFloat(APInt(80, 2, bits)));
-    } else {