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

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/run-make-fulldeps/no-duplicate-libs/Makefile | 10 ----------
 src/test/run-make-fulldeps/no-duplicate-libs/bar.c    |  5 -----
 src/test/run-make-fulldeps/no-duplicate-libs/foo.c    |  1 -
 src/test/run-make-fulldeps/no-duplicate-libs/main.rs  | 10 ----------
 4 files changed, 26 deletions(-)
 delete mode 100644 src/test/run-make-fulldeps/no-duplicate-libs/Makefile
 delete mode 100644 src/test/run-make-fulldeps/no-duplicate-libs/bar.c
 delete mode 100644 src/test/run-make-fulldeps/no-duplicate-libs/foo.c
 delete mode 100644 src/test/run-make-fulldeps/no-duplicate-libs/main.rs

(limited to 'src/test/run-make-fulldeps/no-duplicate-libs')

diff --git a/src/test/run-make-fulldeps/no-duplicate-libs/Makefile b/src/test/run-make-fulldeps/no-duplicate-libs/Makefile
deleted file mode 100644
index b05aff782..000000000
--- a/src/test/run-make-fulldeps/no-duplicate-libs/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-include ../tools.mk
-
-ifdef IS_MSVC
-# FIXME(#27979)
-all:
-else
-all: $(call STATICLIB,foo) $(call STATICLIB,bar)
-	$(RUSTC) main.rs
-	$(call RUN,main)
-endif
diff --git a/src/test/run-make-fulldeps/no-duplicate-libs/bar.c b/src/test/run-make-fulldeps/no-duplicate-libs/bar.c
deleted file mode 100644
index e36952657..000000000
--- a/src/test/run-make-fulldeps/no-duplicate-libs/bar.c
+++ /dev/null
@@ -1,5 +0,0 @@
-extern void foo();
-
-void bar() {
-  foo();
-}
diff --git a/src/test/run-make-fulldeps/no-duplicate-libs/foo.c b/src/test/run-make-fulldeps/no-duplicate-libs/foo.c
deleted file mode 100644
index 85e6cd8c3..000000000
--- a/src/test/run-make-fulldeps/no-duplicate-libs/foo.c
+++ /dev/null
@@ -1 +0,0 @@
-void foo() {}
diff --git a/src/test/run-make-fulldeps/no-duplicate-libs/main.rs b/src/test/run-make-fulldeps/no-duplicate-libs/main.rs
deleted file mode 100644
index b25ef35ad..000000000
--- a/src/test/run-make-fulldeps/no-duplicate-libs/main.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#[link(name = "foo")] // linker should drop this library, no symbols used
-#[link(name = "bar")] // symbol comes from this library
-#[link(name = "foo")] // now linker picks up `foo` b/c `bar` library needs it
-extern "C" {
-    fn bar();
-}
-
-fn main() {
-    unsafe { bar() }
-}
-- 
cgit v1.2.3