Skip to content

Commit aac23ce

Browse files
committed
Revert "Adjust position of TLS_MODULE_BASE based on output type"
This reverts commit bbd779a.
1 parent 76f0ea8 commit aac23ce

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

libwild/src/elf_writer.rs

+5-10
Original file line numberDiff line numberDiff line change
@@ -2542,21 +2542,16 @@ fn write_internal_symbols<S: StorageModel>(
25422542
shndx = 1;
25432543
}
25442544

2545-
let mut address = resolution.address()?;
2545+
let address = resolution.address()?;
2546+
let entry = symbol_writer
2547+
.define_symbol(false, shndx, address, 0, symbol_name.bytes())
2548+
.with_context(|| format!("Failed to write {}", layout.symbol_debug(symbol_id)))?;
2549+
25462550
let st_type = if symbol_name.bytes() == TLS_MODULE_BASE_SYMBOL_NAME.as_bytes() {
2547-
// TODO: handle properly the symbol address
2548-
if layout.args().output_kind != OutputKind::SharedObject {
2549-
address = layout.tls_end_address();
2550-
}
25512551
object::elf::STT_TLS
25522552
} else {
25532553
object::elf::STT_NOTYPE
25542554
};
2555-
2556-
let entry = symbol_writer
2557-
.define_symbol(false, shndx, address, 0, symbol_name.bytes())
2558-
.with_context(|| format!("Failed to write {}", layout.symbol_debug(symbol_id)))?;
2559-
25602555
entry.set_st_info(object::elf::STB_GLOBAL, st_type);
25612556
}
25622557
Ok(())

0 commit comments

Comments
 (0)