diff options
| author | Brian Anderson <[email protected]> | 2011-03-13 19:40:25 -0400 |
|---|---|---|
| committer | Brian Anderson <[email protected]> | 2011-03-13 19:40:25 -0400 |
| commit | bbb6836da003be71744b6e6ea7af1fd4674f8291 (patch) | |
| tree | fc7780f767666cced8406818806216bee3863c91 /src/boot/be | |
| parent | Remove extra blocks from the translation of expr_block (diff) | |
| parent | Add llvmext/include to the list of include directories to hopefully put out t... (diff) | |
| download | rust-bbb6836da003be71744b6e6ea7af1fd4674f8291.tar.xz rust-bbb6836da003be71744b6e6ea7af1fd4674f8291.zip | |
Merge branch 'master' into recursive-elseif
Conflicts:
src/comp/middle/typeck.rs
Diffstat (limited to 'src/boot/be')
| -rw-r--r-- | src/boot/be/abi.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/boot/be/abi.ml b/src/boot/be/abi.ml index 89e308bf..023e1e1d 100644 --- a/src/boot/be/abi.ml +++ b/src/boot/be/abi.ml @@ -80,7 +80,7 @@ let general_code_alignment = 16;; let tydesc_field_first_param = 0;; let tydesc_field_size = 1;; let tydesc_field_align = 2;; -let tydesc_field_copy_glue = 3;; +let tydesc_field_take_glue = 3;; let tydesc_field_drop_glue = 4;; let tydesc_field_free_glue = 5;; let tydesc_field_sever_glue = 6;; |