BPF: misc minor review fixes

compiler/rustc_target/src/spec/bpf_base.rs

@@ -12,6 +12,10 @@ pub fn opts(endian: Endian) -> TargetOptions {
         no_builtins: true,
         panic_strategy: PanicStrategy::Abort,
         position_independent_executables: true,
+        // Disable MergeFunctions since:
+        // - older kernels don't support bpf-to-bpf calls
+        // - on newer kernels, userspace still needs to relocate before calling
+        //   BPF_PROG_LOAD and not all BPF libraries do that yet
         merge_functions: MergeFunctions::Disabled,
         obj_is_bitcode: true,
         requires_lto: false,

src/bootstrap/native.rs

@@ -235,8 +235,8 @@ impl Step for Llvm {
         let llvm_targets = match &builder.config.llvm_targets {
             Some(s) => s,
             None => {
-                "AArch64;ARM;Hexagon;MSP430;Mips;NVPTX;PowerPC;RISCV;\
-                     Sparc;SystemZ;WebAssembly;X86;BPF"
+                "AArch64;ARM;BPF;Hexagon;MSP430;Mips;NVPTX;PowerPC;RISCV;\
+                     Sparc;SystemZ;WebAssembly;X86"
             }
         };
 

src/tools/compiletest/src/runtest.rs

@@ -2311,10 +2311,6 @@ impl<'test> TestCx<'test> {
                 // No extra flags needed.
             }
 
-            Some("bpf-linker") => {
-                rustc.arg("-Clink-args=--emit=asm");
-            }
-
             Some(_) => self.fatal("unknown 'assembly-output' header"),
             None => self.fatal("missing 'assembly-output' header"),
         }

src/tools/compiletest/src/util.rs

@@ -48,8 +48,8 @@ const ARCH_TABLE: &[(&str, &str)] = &[
     ("armv7s", "arm"),
     ("asmjs", "asmjs"),
     ("avr", "avr"),
-    ("bpfeb", "bpfeb"),
-    ("bpfel", "bpfel"),
+    ("bpfeb", "bpf"),
+    ("bpfel", "bpf"),
     ("hexagon", "hexagon"),
     ("i386", "x86"),
     ("i586", "x86"),