From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/run-make/pass-linker-flags-from-dep/Makefile | 10 ---------- src/test/run-make/pass-linker-flags-from-dep/main.rs | 3 --- src/test/run-make/pass-linker-flags-from-dep/native_dep_1.rs | 1 - src/test/run-make/pass-linker-flags-from-dep/native_dep_2.rs | 1 - src/test/run-make/pass-linker-flags-from-dep/rust_dep.rs | 9 --------- 5 files changed, 24 deletions(-) delete mode 100644 src/test/run-make/pass-linker-flags-from-dep/Makefile delete mode 100644 src/test/run-make/pass-linker-flags-from-dep/main.rs delete mode 100644 src/test/run-make/pass-linker-flags-from-dep/native_dep_1.rs delete mode 100644 src/test/run-make/pass-linker-flags-from-dep/native_dep_2.rs delete mode 100644 src/test/run-make/pass-linker-flags-from-dep/rust_dep.rs (limited to 'src/test/run-make/pass-linker-flags-from-dep') diff --git a/src/test/run-make/pass-linker-flags-from-dep/Makefile b/src/test/run-make/pass-linker-flags-from-dep/Makefile deleted file mode 100644 index b9426326a..000000000 --- a/src/test/run-make/pass-linker-flags-from-dep/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -include ../../run-make-fulldeps/tools.mk - -all: - # Build deps - $(RUSTC) native_dep_1.rs --crate-type=staticlib - $(RUSTC) native_dep_2.rs --crate-type=staticlib - $(RUSTC) rust_dep.rs -l static:-bundle=native_dep_1 -l link-arg=some_flag -l static:-bundle=native_dep_2 --crate-type=lib -Z unstable-options - - # Check sequence of linker args - $(RUSTC) main.rs --extern lib=$(TMPDIR)/librust_dep.rlib --crate-type=bin --print link-args | $(CGREP) -e 'native_dep_1.*some_flag.*native_dep_2' diff --git a/src/test/run-make/pass-linker-flags-from-dep/main.rs b/src/test/run-make/pass-linker-flags-from-dep/main.rs deleted file mode 100644 index 40952fb22..000000000 --- a/src/test/run-make/pass-linker-flags-from-dep/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - lib::f(); -} diff --git a/src/test/run-make/pass-linker-flags-from-dep/native_dep_1.rs b/src/test/run-make/pass-linker-flags-from-dep/native_dep_1.rs deleted file mode 100644 index fdb2d9ca6..000000000 --- a/src/test/run-make/pass-linker-flags-from-dep/native_dep_1.rs +++ /dev/null @@ -1 +0,0 @@ -pub fn f1() {} diff --git a/src/test/run-make/pass-linker-flags-from-dep/native_dep_2.rs b/src/test/run-make/pass-linker-flags-from-dep/native_dep_2.rs deleted file mode 100644 index f788b7711..000000000 --- a/src/test/run-make/pass-linker-flags-from-dep/native_dep_2.rs +++ /dev/null @@ -1 +0,0 @@ -pub fn f2() {} diff --git a/src/test/run-make/pass-linker-flags-from-dep/rust_dep.rs b/src/test/run-make/pass-linker-flags-from-dep/rust_dep.rs deleted file mode 100644 index 7f5df1139..000000000 --- a/src/test/run-make/pass-linker-flags-from-dep/rust_dep.rs +++ /dev/null @@ -1,9 +0,0 @@ -extern "C" { - pub fn foo(); -} - -pub fn f() { - unsafe { - foo(); - } -} -- cgit v1.2.3