From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../run-make-fulldeps/interdependent-c-libraries/Makefile  | 14 --------------
 .../run-make-fulldeps/interdependent-c-libraries/bar.c     |  3 ---
 .../run-make-fulldeps/interdependent-c-libraries/bar.rs    | 14 --------------
 .../run-make-fulldeps/interdependent-c-libraries/foo.c     |  1 -
 .../run-make-fulldeps/interdependent-c-libraries/foo.rs    | 12 ------------
 .../run-make-fulldeps/interdependent-c-libraries/main.rs   |  6 ------
 6 files changed, 50 deletions(-)
 delete mode 100644 src/test/run-make-fulldeps/interdependent-c-libraries/Makefile
 delete mode 100644 src/test/run-make-fulldeps/interdependent-c-libraries/bar.c
 delete mode 100644 src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs
 delete mode 100644 src/test/run-make-fulldeps/interdependent-c-libraries/foo.c
 delete mode 100644 src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs
 delete mode 100644 src/test/run-make-fulldeps/interdependent-c-libraries/main.rs

(limited to 'src/test/run-make-fulldeps/interdependent-c-libraries')

diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile b/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile
deleted file mode 100644
index dc5b55a99..000000000
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-include ../tools.mk
-
-# The rust crate foo will link to the native library foo, while the rust crate
-# bar will link to the native library bar. There is also a dependency between
-# the native library bar to the natibe library foo.
-#
-# This test ensures that the ordering of -lfoo and -lbar on the command line is
-# correct to complete the linkage. If passed as "-lfoo -lbar", then the 'foo'
-# library will be stripped out, and the linkage will fail.
-
-all: $(call NATIVE_STATICLIB,foo) $(call NATIVE_STATICLIB,bar)
-	$(RUSTC) foo.rs
-	$(RUSTC) bar.rs
-	$(RUSTC) main.rs --print link-args
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c
deleted file mode 100644
index 812c97535..000000000
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c
+++ /dev/null
@@ -1,3 +0,0 @@
-void foo();
-
-void bar() { foo(); }
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs
deleted file mode 100644
index 3c2c3f218..000000000
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#![crate_type = "rlib"]
-
-extern crate foo;
-
-#[link(name = "bar", kind = "static")]
-extern "C" {
-    fn bar();
-}
-
-pub fn doit() {
-    unsafe {
-        bar();
-    }
-}
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c
deleted file mode 100644
index 85e6cd8c3..000000000
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c
+++ /dev/null
@@ -1 +0,0 @@
-void foo() {}
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs
deleted file mode 100644
index a69809726..000000000
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#![crate_type = "rlib"]
-
-#[link(name = "foo", kind = "static")]
-extern "C" {
-    fn foo();
-}
-
-pub fn doit() {
-    unsafe {
-        foo();
-    }
-}
diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs
deleted file mode 100644
index 2aba427df..000000000
--- a/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-extern crate foo;
-extern crate bar;
-
-fn main() {
-    bar::doit();
-}
-- 
cgit v1.2.3