about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-04-27 21:34:16 +0200
committerGitHub <noreply@github.com>2023-04-27 21:34:16 +0200
commitd3c43d0a22c70a1ca0f4aadb215ce8fbbe473aa0 (patch)
tree8bb7351e1efa52119ed4dabc853e70b2491ff95a
parent743d565235498933599c9283d7c1aa7d4dce1faf (diff)
parentc7e16af796ffcf95e9e4063c0711229bcfaa659e (diff)
downloadrust-d3c43d0a22c70a1ca0f4aadb215ce8fbbe473aa0.tar.gz
rust-d3c43d0a22c70a1ca0f4aadb215ce8fbbe473aa0.zip
Rollup merge of #110853 - tamird:compiletest-bpflinker-support, r=wesleywiser
compiletest: add bpf-linker assembly support
-rw-r--r--src/tools/compiletest/src/runtest.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index f5b34f83952..e03a73c4e71 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -224,6 +224,7 @@ enum Emit {
     Metadata,
     LlvmIr,
     Asm,
+    LinkArgsAsm,
 }
 
 impl<'test> TestCx<'test> {
@@ -2035,6 +2036,9 @@ impl<'test> TestCx<'test> {
             Emit::Asm => {
                 rustc.args(&["--emit", "asm"]);
             }
+            Emit::LinkArgsAsm => {
+                rustc.args(&["-Clink-args=--emit=asm"]);
+            }
         }
 
         if !is_rustdoc {
@@ -2328,6 +2332,10 @@ impl<'test> TestCx<'test> {
                 emit = Emit::Asm;
             }
 
+            Some("bpf-linker") => {
+                emit = Emit::LinkArgsAsm;
+            }
+
             Some("ptx-linker") => {
                 // No extra flags needed.
             }