aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DataLayoutPass was removed

Browse Source
This commit is contained in:
Vsevolod Livinskiy
2015-03-05 17:09:39 +03:00
parent a216b2bb9c
commit f0aa481a2a
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtins/dispatch.ll
View File

@@ -104,6 +104,19 @@
;; abort(); ;; abort();
;; } ;; }
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; LLVM has different IR for different versions since 3.7
define(`PTR_OP_ARGS',
ifelse(LLVM_VERSION, LLVM_3_7,
``$1 , $1 * $2'',
``$1 * $2''
)
)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
define i32 @__get_system_isa() nounwind uwtable { define i32 @__get_system_isa() nounwind uwtable {
entry: entry:
%0 = tail call { i32, i32, i32, i32 } asm sideeffect "cpuid", "={ax},={bx},={cx},={dx},0,~{dirflag},~{fpsr},~{flags}"(i32 1) nounwind %0 = tail call { i32, i32, i32, i32 } asm sideeffect "cpuid", "={ax},={bx},={cx},={dx},0,~{dirflag},~{fpsr},~{flags}"(i32 1) nounwind

4
module.cpp
View File

@@ -1406,11 +1406,11 @@ Module::writeObjectFileOrAssembly(llvm::TargetMachine *targetMachine,
pm.add(new llvm::DataLayout(*g->target->getDataLayout())); pm.add(new llvm::DataLayout(*g->target->getDataLayout()));
#elif defined(LLVM_3_5) #elif defined(LLVM_3_5)
pm.add(new llvm::DataLayoutPass(*g->target->getDataLayout())); pm.add(new llvm::DataLayoutPass(*g->target->getDataLayout()));
#else // LLVM 3.6+ #elif defined(LLVM_3_6)
llvm::DataLayoutPass *dlp= new llvm::DataLayoutPass(); llvm::DataLayoutPass *dlp= new llvm::DataLayoutPass();
dlp->doInitialization(*module); dlp->doInitialization(*module);
pm.add(dlp); pm.add(dlp);
#endif #endif // LLVM 3.7+ doesn't have DataLayoutPass anymore.
llvm::formatted_raw_ostream fos(of->os()); llvm::formatted_raw_ostream fos(of->os());

4
opt.cpp
View File

@@ -528,11 +528,11 @@ Optimize(llvm::Module *module, int optLevel) {
optPM.add(new llvm::DataLayout(*g->target->getDataLayout())); optPM.add(new llvm::DataLayout(*g->target->getDataLayout()));
#elif defined(LLVM_3_5) #elif defined(LLVM_3_5)
optPM.add(new llvm::DataLayoutPass(*g->target->getDataLayout())); optPM.add(new llvm::DataLayoutPass(*g->target->getDataLayout()));
#else // LLVM 3.6+ #elif defined(LLVM_3_6)
llvm::DataLayoutPass *dlp= new llvm::DataLayoutPass(); llvm::DataLayoutPass *dlp= new llvm::DataLayoutPass();
dlp->doInitialization(*module); dlp->doInitialization(*module);
optPM.add(dlp); optPM.add(dlp);
#endif #endif // LLVM 3.7+ doesn't have DataLayoutPass anymore.
llvm::TargetMachine *targetMachine = g->target->GetTargetMachine(); llvm::TargetMachine *targetMachine = g->target->GetTargetMachine();