Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 0 insertions, 63 deletions

diff --git a/src/test/codegen/dllimports/auxiliary/dummy.rs b/src/test/codegen/dllimports/auxiliary/dummy.rs
deleted file mode 100644
index 113a164f1..000000000
--- a/src/test/codegen/dllimports/auxiliary/dummy.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// no-prefer-dynamic
-#![crate_type = "staticlib"]
-
-// Since codegen tests don't actually perform linking, this library doesn't need to export
-// any symbols.  It's here just to satisfy the compiler looking for a .lib file when processing
-// #[link(...)] attributes in wrapper.rs.
diff --git a/src/test/codegen/dllimports/auxiliary/wrapper.rs b/src/test/codegen/dllimports/auxiliary/wrapper.rs
deleted file mode 100644
index 7aa90920a..000000000
--- a/src/test/codegen/dllimports/auxiliary/wrapper.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// no-prefer-dynamic
-#![crate_type = "rlib"]
-
-#[link(name = "dummy", kind="dylib")]
-extern "C" {
-    pub fn dylib_func2(x: i32) -> i32;
-    pub static dylib_global2: i32;
-}
-
-#[link(name = "dummy", kind="static")]
-extern "C" {
-    pub fn static_func2(x: i32) -> i32;
-    pub static static_global2: i32;
-}
diff --git a/src/test/codegen/dllimports/main.rs b/src/test/codegen/dllimports/main.rs
deleted file mode 100644
index ab599992f..000000000
--- a/src/test/codegen/dllimports/main.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// This test is for *-windows-msvc only.
-// only-windows
-// ignore-gnu
-
-// aux-build:dummy.rs
-// aux-build:wrapper.rs
-
-extern crate wrapper;
-
-// Check that external symbols coming from foreign dylibs are adorned with 'dllimport',
-// whereas symbols coming from foreign staticlibs are not. (RFC-1717)
-
-// CHECK: @dylib_global1 = external dllimport local_unnamed_addr global i32
-// CHECK: @dylib_global2 = external dllimport local_unnamed_addr global i32
-// CHECK: @static_global1 = external local_unnamed_addr global i32
-// CHECK: @static_global2 = external local_unnamed_addr global i32
-
-// CHECK: declare dllimport i32 @dylib_func1(i32)
-// CHECK: declare dllimport i32 @dylib_func2(i32)
-// CHECK: declare i32 @static_func1(i32)
-// CHECK: declare i32 @static_func2(i32)
-
-#[link(name = "dummy", kind="dylib")]
-extern "C" {
-    pub fn dylib_func1(x: i32) -> i32;
-    pub static dylib_global1: i32;
-}
-
-#[link(name = "dummy", kind="static")]
-extern "C" {
-    pub fn static_func1(x: i32) -> i32;
-    pub static static_global1: i32;
-}
-
-fn main() {
-    unsafe {
-        dylib_func1(dylib_global1);
-        wrapper::dylib_func2(wrapper::dylib_global2);
-
-        static_func1(static_global1);
-        wrapper::static_func2(wrapper::static_global2);
-    }
-}