Merging upstream version 1.68.2+dfsg1.

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

4 files changed, 26 insertions, 0 deletions

diff --git a/tests/run-make-fulldeps/mixing-deps/Makefile b/tests/run-make-fulldeps/mixing-deps/Makefile
new file mode 100644
index 000000000..956e704ee
--- /dev/null
+++ b/tests/run-make-fulldeps/mixing-deps/Makefile
@@ -0,0 +1,7 @@
+include ../tools.mk
+
+all:
+	$(RUSTC) both.rs -C prefer-dynamic
+	$(RUSTC) dylib.rs -C prefer-dynamic
+	$(RUSTC) prog.rs
+	$(call RUN,prog)
diff --git a/tests/run-make-fulldeps/mixing-deps/both.rs b/tests/run-make-fulldeps/mixing-deps/both.rs
new file mode 100644
index 000000000..6a5818763
--- /dev/null
+++ b/tests/run-make-fulldeps/mixing-deps/both.rs
@@ -0,0 +1,4 @@
+#![crate_type = "rlib"]
+#![crate_type = "dylib"]
+
+pub static foo: isize = 4;
diff --git a/tests/run-make-fulldeps/mixing-deps/dylib.rs b/tests/run-make-fulldeps/mixing-deps/dylib.rs
new file mode 100644
index 000000000..88976d5b6
--- /dev/null
+++ b/tests/run-make-fulldeps/mixing-deps/dylib.rs
@@ -0,0 +1,6 @@
+#![crate_type = "dylib"]
+extern crate both;
+
+use std::mem;
+
+pub fn addr() -> usize { unsafe { mem::transmute(&both::foo) } }
diff --git a/tests/run-make-fulldeps/mixing-deps/prog.rs b/tests/run-make-fulldeps/mixing-deps/prog.rs
new file mode 100644
index 000000000..188981dc1
--- /dev/null
+++ b/tests/run-make-fulldeps/mixing-deps/prog.rs
@@ -0,0 +1,9 @@
+extern crate dylib;
+extern crate both;
+
+use std::mem;
+
+fn main() {
+    assert_eq!(unsafe { mem::transmute::<&isize, usize>(&both::foo) },
+               dylib::addr());
+}