Skip to content

Commit f064048

Browse files
committed
Remove a android hack
1 parent 84c296b commit f064048

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

src/librustc/middle/trans/base.rs

+8-19
Original file line numberDiff line numberDiff line change
@@ -2284,25 +2284,14 @@ pub fn create_main_wrapper(ccx: @CrateContext,
22842284
let opaque_crate_map = llvm::LLVMBuildPointerCast(
22852285
bld, crate_map, T_ptr(T_i8()), noname());
22862286
2287-
if *ccx.sess.building_library {
2288-
~[
2289-
retptr,
2290-
C_null(T_opaque_box_ptr(ccx)),
2291-
opaque_rust_main,
2292-
llvm::LLVMConstInt(T_i32(), 0u as c_ulonglong, False),
2293-
llvm::LLVMConstInt(T_i32(), 0u as c_ulonglong, False),
2294-
opaque_crate_map
2295-
]
2296-
} else {
2297-
~[
2298-
retptr,
2299-
C_null(T_opaque_box_ptr(ccx)),
2300-
opaque_rust_main,
2301-
llvm::LLVMGetParam(llfn, 0 as c_uint),
2302-
llvm::LLVMGetParam(llfn, 1 as c_uint),
2303-
opaque_crate_map
2304-
]
2305-
}
2287+
~[
2288+
retptr,
2289+
C_null(T_opaque_box_ptr(ccx)),
2290+
opaque_rust_main,
2291+
llvm::LLVMGetParam(llfn, 0 as c_uint),
2292+
llvm::LLVMGetParam(llfn, 1 as c_uint),
2293+
opaque_crate_map
2294+
]
23062295
};
23072296
23082297
unsafe {

0 commit comments

Comments
 (0)