Auto merge of rust-lang#146133 - rcvalle:rust-cfi-fix-145981, r=bjorn3

Revert "Make `lto` and `linker-plugin-lto` work the same for `compiler_builtins`

This reverts commit cf8753e (PR rust-lang#145368) and fix the regressions reported at rust-lang#145981, rust-lang#146109, and rust-lang#146145.

Author: bors