Merging upstream version 1.70.0+dfsg1.

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

3 files changed, 33 insertions, 0 deletions

diff --git a/tests/run-make/extern-fn-mangle/Makefile b/tests/run-make/extern-fn-mangle/Makefile
new file mode 100644
index 000000000..3cbbf3839
--- /dev/null
+++ b/tests/run-make/extern-fn-mangle/Makefile
@@ -0,0 +1,6 @@
+# ignore-cross-compile
+include ../tools.mk
+
+all: $(call NATIVE_STATICLIB,test)
+	$(RUSTC) test.rs
+	$(call RUN,test) || exit 1
diff --git a/tests/run-make/extern-fn-mangle/test.c b/tests/run-make/extern-fn-mangle/test.c
new file mode 100644
index 000000000..e94d75083
--- /dev/null
+++ b/tests/run-make/extern-fn-mangle/test.c
@@ -0,0 +1,8 @@
+#include <stdint.h>
+
+uint32_t foo();
+uint32_t bar();
+
+uint32_t add() {
+        return foo() + bar();
+}
diff --git a/tests/run-make/extern-fn-mangle/test.rs b/tests/run-make/extern-fn-mangle/test.rs
new file mode 100644
index 000000000..40b08f1ed
--- /dev/null
+++ b/tests/run-make/extern-fn-mangle/test.rs
@@ -0,0 +1,19 @@
+#[no_mangle]
+pub extern "C" fn foo() -> i32 {
+    3
+}
+
+#[no_mangle]
+pub extern "C" fn bar() -> i32 {
+    5
+}
+
+#[link(name = "test", kind = "static")]
+extern "C" {
+    fn add() -> i32;
+}
+
+fn main() {
+    let back = unsafe { add() };
+    assert_eq!(8, back);
+}