diff options
| author | bors <bors@rust-lang.org> | 2015-11-07 02:26:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-07 02:26:45 +0000 |
| commit | bb9b5f5edeb91fa7fc9bd7c220d69985e0175ba2 (patch) | |
| tree | 3b8244879018938a1650fcebe24e0d2949ee4d25 /src/test | |
| parent | 1e3e7e73c6086bead3949476c4f0c8231e6a0fc8 (diff) | |
| parent | d9dd67d90829ae2ce9422b264a1971e8e9c45c5a (diff) | |
| download | rust-bb9b5f5edeb91fa7fc9bd7c220d69985e0175ba2.tar.gz rust-bb9b5f5edeb91fa7fc9bd7c220d69985e0175ba2.zip | |
Auto merge of #29666 - Manishearth:rollup, r=Manishearth
- Successful merges: #29617, #29622, #29656, #29659, #29660 - Failed merges:
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make/issue-14500/foo.c | 3 | ||||
| -rw-r--r-- | src/test/run-make/issue-14500/foo.rs | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/test/run-make/issue-14500/foo.c b/src/test/run-make/issue-14500/foo.c index 25098ac479d..e84b5509c50 100644 --- a/src/test/run-make/issue-14500/foo.c +++ b/src/test/run-make/issue-14500/foo.c @@ -9,8 +9,9 @@ // except according to those terms. extern void foo(); +extern char FOO_STATIC; int main() { foo(); - return 0; + return (int)FOO_STATIC; } diff --git a/src/test/run-make/issue-14500/foo.rs b/src/test/run-make/issue-14500/foo.rs index ceca907403f..a91d8d6a21d 100644 --- a/src/test/run-make/issue-14500/foo.rs +++ b/src/test/run-make/issue-14500/foo.rs @@ -10,3 +10,6 @@ #[no_mangle] pub extern fn foo() {} + +#[no_mangle] +pub static FOO_STATIC: u8 = 0; |