diff options
| author | ILyoan <ilyoan@gmail.com> | 2013-04-03 14:42:50 +0900 |
|---|---|---|
| committer | ILyoan <ilyoan@gmail.com> | 2013-04-04 10:44:48 +0900 |
| commit | f06404860ce4c083461483b41879ae40f08a3fc2 (patch) | |
| tree | 556048d37f23a018dcf58e8988738f5beb4e3b14 | |
| parent | 84c296b27d3324b419e54bb5c899bd1fdc1f1008 (diff) | |
| download | rust-f06404860ce4c083461483b41879ae40f08a3fc2.tar.gz rust-f06404860ce4c083461483b41879ae40f08a3fc2.zip | |
Remove a android hack
| -rw-r--r-- | src/librustc/middle/trans/base.rs | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index aa97c287b4c..5c5f78aeab6 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -2284,25 +2284,14 @@ pub fn create_main_wrapper(ccx: @CrateContext, let opaque_crate_map = llvm::LLVMBuildPointerCast( bld, crate_map, T_ptr(T_i8()), noname()); - if *ccx.sess.building_library { - ~[ - retptr, - C_null(T_opaque_box_ptr(ccx)), - opaque_rust_main, - llvm::LLVMConstInt(T_i32(), 0u as c_ulonglong, False), - llvm::LLVMConstInt(T_i32(), 0u as c_ulonglong, False), - opaque_crate_map - ] - } else { - ~[ - retptr, - C_null(T_opaque_box_ptr(ccx)), - opaque_rust_main, - llvm::LLVMGetParam(llfn, 0 as c_uint), - llvm::LLVMGetParam(llfn, 1 as c_uint), - opaque_crate_map - ] - } + ~[ + retptr, + C_null(T_opaque_box_ptr(ccx)), + opaque_rust_main, + llvm::LLVMGetParam(llfn, 0 as c_uint), + llvm::LLVMGetParam(llfn, 1 as c_uint), + opaque_crate_map + ] }; unsafe { |