Skip to content

Commit f212ae5

Browse files
committed
---
yaml --- r: 2615 b: refs/heads/master c: a795d0e h: refs/heads/master i: 2613: f586d59 2611: c70d0cf 2607: 3107ca8 v: v3
1 parent 692e6e0 commit f212ae5

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: d108bfe2eed963dda50df916c629bfce53d6bbe1
2+
refs/heads/master: a795d0e5b24a8a74cf2529bfc738af275b5a3e78

trunk/src/comp/back/abi.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ const int worst_case_glue_call_args = 7;
6969

7070
const int n_native_glues = 8;
7171

72-
const int abi_x86_rustboot_cdecl = 1;
73-
const int abi_x86_rustc_fastcall = 2;
74-
7572
tag native_glue_type {
7673
ngt_rust;
7774
ngt_pure_rust;

trunk/src/comp/middle/trans.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,7 @@ fn T_crate(&type_names tn) -> TypeRef {
509509
T_int(), // size_t main_exit_task_glue
510510
T_int(), // int n_rust_syms
511511
T_int(), // int n_c_syms
512-
T_int(), // int n_libs
513-
T_int() // uintptr_t abi_tag
512+
T_int() // int n_libs
514513
]);
515514
tn.associate(s, t);
516515
ret t;
@@ -7504,8 +7503,7 @@ fn create_crate_constant(ValueRef crate_ptr, @glue_fns glues) {
75047503
exit_task_glue_off, // size_t main_exit_task_glue_off
75057504
C_null(T_int()), // int n_rust_syms
75067505
C_null(T_int()), // int n_c_syms
7507-
C_null(T_int()), // int n_libs
7508-
C_int(abi::abi_x86_rustc_fastcall) // uintptr_t abi_tag
7506+
C_null(T_int()) // int n_libs
75097507
]);
75107508

75117509
llvm::LLVMSetInitializer(crate_ptr, crate_val);

trunk/src/rt/rust_internal.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,6 @@ class rust_crate {
243243
size_t n_c_syms;
244244
size_t n_libs;
245245

246-
uintptr_t abi_tag;
247-
248246
// Crates are immutable, constructed by the compiler.
249247

250248
uintptr_t get_image_base() const;

0 commit comments

Comments
 (0)