Fix rust_test_helpers linkage.

2025-02-04 02:54:00 +00:00 · 2016-11-23 16:09:51 -08:00 · 2016-11-23 16:09:51 -08:00 · 4508e8a847
commit 4508e8a847
parent bc019dfb39
34 changed files with 34 additions and 34 deletions
--- a/src/test/run-pass/abi-sysv64-arg-passing.rs
+++ b/src/test/run-pass/abi-sysv64-arg-passing.rs
@ -98,7 +98,7 @@ mod tests {
    #[derive(Copy, Clone)]
    pub struct Floats { a: f64, b: u8, c: f64 }

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern "sysv64" {
        pub fn rust_int8_to_int32(_: i8) -> i32;
        pub fn rust_dbg_extern_identity_u8(v: u8) -> u8;
--- a/src/test/run-pass/anon-extern-mod.rs
+++ b/src/test/run-pass/anon-extern-mod.rs
@ -14,7 +14,7 @@

 extern crate libc;

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    fn rust_get_test_int() -> libc::intptr_t;
 }
--- a/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs
+++ b/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs
@ -13,7 +13,7 @@

 extern crate libc;

-#[link(name="rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_get_test_int() -> libc::intptr_t;
 }
--- a/src/test/run-pass/auxiliary/extern-crosscrate-source.rs
+++ b/src/test/run-pass/auxiliary/extern-crosscrate-source.rs
@ -17,7 +17,7 @@ extern crate libc;
 pub mod rustrt {
    extern crate libc;

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern {
        pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                             data: libc::uintptr_t)
--- a/src/test/run-pass/auxiliary/foreign_lib.rs
+++ b/src/test/run-pass/auxiliary/foreign_lib.rs
@ -15,7 +15,7 @@
 pub mod rustrt {
    extern crate libc;

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern {
        pub fn rust_get_test_int() -> libc::intptr_t;
    }
--- a/src/test/run-pass/c-stack-as-value.rs
+++ b/src/test/run-pass/c-stack-as-value.rs
@ -15,7 +15,7 @@
 mod rustrt {
    extern crate libc;

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern {
        pub fn rust_get_test_int() -> libc::intptr_t;
    }
--- a/src/test/run-pass/cabi-int-widening.rs
+++ b/src/test/run-pass/cabi-int-widening.rs
@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    fn rust_int8_to_int32(_: i8) -> i32;
 }
--- a/src/test/run-pass/extern-call-deep.rs
+++ b/src/test/run-pass/extern-call-deep.rs
@ -15,7 +15,7 @@ extern crate libc;
 mod rustrt {
    extern crate libc;

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern {
        pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                             data: libc::uintptr_t)
--- a/src/test/run-pass/extern-call-deep2.rs
+++ b/src/test/run-pass/extern-call-deep2.rs
@ -18,7 +18,7 @@ use std::thread;
 mod rustrt {
    extern crate libc;

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern {
        pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                             data: libc::uintptr_t)
--- a/src/test/run-pass/extern-call-indirect.rs
+++ b/src/test/run-pass/extern-call-indirect.rs
@ -15,7 +15,7 @@ extern crate libc;
 mod rustrt {
    extern crate libc;

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern {
        pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                             data: libc::uintptr_t)
--- a/src/test/run-pass/extern-call-scrub.rs
+++ b/src/test/run-pass/extern-call-scrub.rs
@ -22,7 +22,7 @@ use std::thread;
 mod rustrt {
    extern crate libc;

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern {
        pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) -> libc::uintptr_t,
                             data: libc::uintptr_t)
--- a/src/test/run-pass/extern-pass-TwoU16s.rs
+++ b/src/test/run-pass/extern-pass-TwoU16s.rs
@ -16,7 +16,7 @@ pub struct TwoU16s {
    one: u16, two: u16
 }

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_identity_TwoU16s(v: TwoU16s) -> TwoU16s;
 }
--- a/src/test/run-pass/extern-pass-TwoU32s.rs
+++ b/src/test/run-pass/extern-pass-TwoU32s.rs
@ -16,7 +16,7 @@ pub struct TwoU32s {
    one: u32, two: u32
 }

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_identity_TwoU32s(v: TwoU32s) -> TwoU32s;
 }
--- a/src/test/run-pass/extern-pass-TwoU64s.rs
+++ b/src/test/run-pass/extern-pass-TwoU64s.rs
@ -16,7 +16,7 @@ pub struct TwoU64s {
    one: u64, two: u64
 }

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_identity_TwoU64s(v: TwoU64s) -> TwoU64s;
 }
--- a/src/test/run-pass/extern-pass-TwoU8s.rs
+++ b/src/test/run-pass/extern-pass-TwoU8s.rs
@ -16,7 +16,7 @@ pub struct TwoU8s {
    one: u8, two: u8
 }

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_identity_TwoU8s(v: TwoU8s) -> TwoU8s;
 }
--- a/src/test/run-pass/extern-pass-char.rs
+++ b/src/test/run-pass/extern-pass-char.rs
@ -11,7 +11,7 @@
 // Test a function that takes/returns a u8.


-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_identity_u8(v: u8) -> u8;
 }
--- a/src/test/run-pass/extern-pass-double.rs
+++ b/src/test/run-pass/extern-pass-double.rs
@ -9,7 +9,7 @@
 // except according to those terms.


-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_identity_double(v: f64) -> f64;
 }
--- a/src/test/run-pass/extern-pass-empty.rs
+++ b/src/test/run-pass/extern-pass-empty.rs
@ -30,7 +30,7 @@ struct ManyInts {

 struct Empty;

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    fn rust_dbg_extern_empty_struct(v1: ManyInts, e: Empty, v2: ManyInts);
 }
--- a/src/test/run-pass/extern-pass-u32.rs
+++ b/src/test/run-pass/extern-pass-u32.rs
@ -11,7 +11,7 @@
 // Test a function that takes/returns a u32.


-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_identity_u32(v: u32) -> u32;
 }
--- a/src/test/run-pass/extern-pass-u64.rs
+++ b/src/test/run-pass/extern-pass-u64.rs
@ -11,7 +11,7 @@
 // Test a call to a function that takes/returns a u64.


-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_identity_u64(v: u64) -> u64;
 }
--- a/src/test/run-pass/extern-return-TwoU16s.rs
+++ b/src/test/run-pass/extern-return-TwoU16s.rs
@ -13,7 +13,7 @@ pub struct TwoU16s {
    one: u16, two: u16
 }

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_return_TwoU16s() -> TwoU16s;
 }
--- a/src/test/run-pass/extern-return-TwoU32s.rs
+++ b/src/test/run-pass/extern-return-TwoU32s.rs
@ -13,7 +13,7 @@ pub struct TwoU32s {
    one: u32, two: u32
 }

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_return_TwoU32s() -> TwoU32s;
 }
--- a/src/test/run-pass/extern-return-TwoU64s.rs
+++ b/src/test/run-pass/extern-return-TwoU64s.rs
@ -13,7 +13,7 @@ pub struct TwoU64s {
    one: u64, two: u64
 }

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_return_TwoU64s() -> TwoU64s;
 }
--- a/src/test/run-pass/extern-return-TwoU8s.rs
+++ b/src/test/run-pass/extern-return-TwoU8s.rs
@ -13,7 +13,7 @@ pub struct TwoU8s {
    one: u8, two: u8
 }

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn rust_dbg_extern_return_TwoU8s() -> TwoU8s;
 }
--- a/src/test/run-pass/foreign-call-no-runtime.rs
+++ b/src/test/run-pass/foreign-call-no-runtime.rs
@ -18,7 +18,7 @@ extern crate libc;
 use std::mem;
 use std::thread;

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t),
                     data: libc::uintptr_t) -> libc::uintptr_t;
--- a/src/test/run-pass/foreign-fn-with-byval.rs
+++ b/src/test/run-pass/foreign-fn-with-byval.rs
@ -16,7 +16,7 @@ pub struct S {
    z: u64,
 }

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    pub fn get_x(x: S) -> u64;
    pub fn get_y(x: S) -> u64;
--- a/src/test/run-pass/foreign-no-abi.rs
+++ b/src/test/run-pass/foreign-no-abi.rs
@ -17,7 +17,7 @@
 mod rustrt {
    extern crate libc;

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern {
        pub fn rust_get_test_int() -> libc::intptr_t;
    }
--- a/src/test/run-pass/issue-28676.rs
+++ b/src/test/run-pass/issue-28676.rs
@ -15,7 +15,7 @@ pub struct Quad { a: u64, b: u64, c: u64, d: u64 }
 mod rustrt {
    use super::Quad;

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern {
        pub fn get_c_many_params(_: *const (), _: *const (),
                                 _: *const (), _: *const (), f: Quad) -> u64;
--- a/src/test/run-pass/mir_trans_calls_variadic.rs
+++ b/src/test/run-pass/mir_trans_calls_variadic.rs
@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    fn rust_interesting_average(_: i64, ...) -> f64;
 }
--- a/src/test/run-pass/segfault-no-out-of-stack.rs
+++ b/src/test/run-pass/segfault-no-out-of-stack.rs
@ -17,7 +17,7 @@ extern crate libc;
 use std::process::{Command, ExitStatus};
 use std::env;

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    fn rust_get_null_ptr() -> *mut ::libc::c_char;
 }
--- a/src/test/run-pass/static-mut-foreign.rs
+++ b/src/test/run-pass/static-mut-foreign.rs
@ -17,7 +17,7 @@

 extern crate libc;

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    static mut rust_dbg_static_mut: libc::c_int;
    pub fn rust_dbg_static_mut_check_four();
--- a/src/test/run-pass/struct-return.rs
+++ b/src/test/run-pass/struct-return.rs
@ -18,7 +18,7 @@ pub struct Floats { a: f64, b: u8, c: f64 }
 mod rustrt {
    use super::{Floats, Quad};

-    #[link(name = "rust_test_helpers")]
+    #[link(name = "rust_test_helpers", kind = "static")]
    extern {
        pub fn rust_dbg_abi_1(q: Quad) -> Quad;
        pub fn rust_dbg_abi_2(f: Floats) -> Floats;
--- a/src/test/run-pass/union/union-c-interop.rs
+++ b/src/test/run-pass/union/union-c-interop.rs
@ -25,7 +25,7 @@ union LARGE_INTEGER {
  QuadPart: u64,
 }

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern "C" {
    fn increment_all_parts(_: LARGE_INTEGER) -> LARGE_INTEGER;
 }
--- a/src/test/run-pass/variadic-ffi.rs
+++ b/src/test/run-pass/variadic-ffi.rs
@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.

-#[link(name = "rust_test_helpers")]
+#[link(name = "rust_test_helpers", kind = "static")]
 extern {
    fn rust_interesting_average(_: u64, ...) -> f64;
 }