D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-11 18:33:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-2.061-2

Browse Source
This commit is contained in:
David Nadlinger
2013-01-12 01:27:02 +01:00
parent b99b78558b 81aee147cf
commit 30caa4bfe6
30 changed files with 134 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ir/ir.cpp
View File

@@ -7,7 +7,9 @@
//
//===----------------------------------------------------------------------===//
#if LDC_LLVM_VER >= 302
#if LDC_LLVM_VER >= 303
#include "llvm/IR/DataLayout.h"
#elif LDC_LLVM_VER == 302
#include "llvm/DataLayout.h"
#else
#include "llvm/Target/TargetData.h"

5
ir/irclass.cpp
View File

@@ -7,8 +7,13 @@
//
//===----------------------------------------------------------------------===//
#if LDC_LLVM_VER >= 303
#include "llvm/IR/Constants.h"
#include "llvm/IR/DerivedTypes.h"
#else
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
#endif
#include "llvm/ADT/SmallString.h"
#include "aggregate.h"

5
ir/irtype.cpp
View File

@@ -7,8 +7,13 @@
//
//===----------------------------------------------------------------------===//
#if LDC_LLVM_VER >= 303
#include "llvm/IR/DerivedTypes.h"
#include "llvm/IR/LLVMContext.h"
#else
#include "llvm/DerivedTypes.h"
#include "llvm/LLVMContext.h"
#endif
#include "mars.h"
#include "mtype.h"
#include "gen/irstate.h"

4
ir/irtype.h
View File

@@ -16,7 +16,11 @@
#ifndef __LDC_IR_IRTYPE_H__
#define __LDC_IR_IRTYPE_H__
#if LDC_LLVM_VER >= 303
#include "llvm/IR/Type.h"
#else
#include "llvm/Type.h"
#endif
//////////////////////////////////////////////////////////////////////////////

4
ir/irtypeclass.cpp
View File

@@ -7,7 +7,11 @@
//
//===----------------------------------------------------------------------===//
#if LDC_LLVM_VER >= 303
#include "llvm/IR/DerivedTypes.h"
#else
#include "llvm/DerivedTypes.h"
#endif
#include "aggregate.h"
#include "declaration.h"

4
ir/irtypeclass.h
View File

@@ -15,7 +15,11 @@
#define __LDC_IR_IRTYPECLASS_H__
#include "ir/irtypestruct.h"
#if LDC_LLVM_VER >= 303
#include <llvm/IR/DerivedTypes.h>
#else
#include <llvm/DerivedTypes.h>
#endif
///
class IrTypeClass : public IrTypeAggr

4
ir/irtypefunction.cpp
View File

@@ -7,7 +7,11 @@
//
//===----------------------------------------------------------------------===//
#if LDC_LLVM_VER >= 303
#include "llvm/IR/DerivedTypes.h"
#else
#include "llvm/DerivedTypes.h"
#endif
#include "mtype.h"
#include "gen/irstate.h"

4
ir/irtypestruct.cpp
View File

@@ -7,7 +7,11 @@
//
//===----------------------------------------------------------------------===//
#if LDC_LLVM_VER >= 303
#include "llvm/IR/DerivedTypes.h"
#else
#include "llvm/DerivedTypes.h"
#endif
#include "aggregate.h"
#include "declaration.h"

4
ir/irvar.h
View File

@@ -16,7 +16,11 @@
#define LDC_IR_IRVAR_H
#include "ir/ir.h"
#if LDC_LLVM_VER >= 303
#include "llvm/IR/Type.h"
#else
#include "llvm/Type.h"
#endif
struct IrFuncTyArg;