diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-08-08 03:30:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-08 03:30:54 +0200 |
| commit | 328e9785fbe9f5a0cfebfac644c4e02dcb00051c (patch) | |
| tree | cc0c54dce4eb9f05217a1fc5416f551b6d9a2726 /compiler/rustc_codegen_ssa/src | |
| parent | 443c3161dd04f4c1b656a626f9079921bee9c326 (diff) | |
| parent | 2e29d85f7e88e06bb780d74749c156f03b2ff5f2 (diff) | |
| download | rust-328e9785fbe9f5a0cfebfac644c4e02dcb00051c.tar.gz rust-328e9785fbe9f5a0cfebfac644c4e02dcb00051c.zip | |
Rollup merge of #114376 - inferiorhumanorgans:rustc-codegen-ssa-duplicate-export, r=wesleywiser
Avoid exporting __rust_alloc_error_handler_should_panic more than once. Exporting `__rust_alloc_error_handler_should_panic` multiple times causes `ld.gold` to balk with: `error: version script assignment of to symbol __rust_alloc_error_handler_should_panic failed: symbol not defined` Specifically this breaks builds of 1.70.0 and newer on DragonFly and YoctoProject with `ld.gold`. Builds with `ld.bfd` and `lld` should be unaffected. http://errors.yoctoproject.org/Errors/Details/708194/
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/symbol_export.rs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs index cbe7e519079..326b28ad104 100644 --- a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs +++ b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs @@ -233,15 +233,6 @@ fn exported_symbols_provider_local( )); } - symbols.push(( - ExportedSymbol::NoDefId(SymbolName::new(tcx, OomStrategy::SYMBOL)), - SymbolExportInfo { - level: SymbolExportLevel::Rust, - kind: SymbolExportKind::Text, - used: false, - }, - )); - let exported_symbol = ExportedSymbol::NoDefId(SymbolName::new(tcx, NO_ALLOC_SHIM_IS_UNSTABLE)); symbols.push(( |