Address review comments for #53031 and fix some merge fallout.

src/test/codegen/no-dllimport-w-cross-lang-lto.rs

@@ -13,7 +13,7 @@
 
 // no-prefer-dynamic
 // only-msvc
-// compile-flags: -C no-prepopulate-passes -Z cross-lang-lto
+// compile-flags: -Z cross-lang-lto
 
 #![crate_type = "rlib"]
 

src/test/codegen/target-cpu-on-functions.rs

@@ -11,8 +11,10 @@
 // This test makes sure that functions get annotated with the proper
 // "target-cpu" attribute in LLVM.
 
+// no-prefer-dynamic
+// ignore-tidy-linelength
 // only-x86_64
-// compile-flags: -C no-prepopulate-passes -C panic=abort
+// compile-flags: -C no-prepopulate-passes -C panic=abort -Z cross-lang-lto -Cpasses=name-anon-globals
 
 #![crate_type = "staticlib"]