D33346.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D33346.id.diff
View Options

	diff --git a/libexec/rtld-elf/mips/reloc.c b/libexec/rtld-elf/mips/reloc.c
	--- a/libexec/rtld-elf/mips/reloc.c
	+++ b/libexec/rtld-elf/mips/reloc.c
	@@ -591,7 +591,7 @@
	if (!defobj->tls_done && !allocate_tls_offset(obj))
	return -1;

	- val += (Elf_Addr)def->st_value - TLS_DTP_OFFSET;
	+ val += (Elf_Addr)def->st_value - TLS_DTV_OFFSET;
	store_ptr(where, val, rlen);

	dbg("DTPREL %s in %s %p --> %p in %s",
	@@ -784,7 +784,7 @@

	tls = _get_tp();
	p = tls_get_addr_common(tls, ti->ti_module, ti->ti_offset +
	- TLS_DTP_OFFSET);
	+ TLS_DTV_OFFSET);

	return (p);
	}
	diff --git a/libexec/rtld-elf/mips/rtld_machdep.h b/libexec/rtld-elf/mips/rtld_machdep.h
	--- a/libexec/rtld-elf/mips/rtld_machdep.h
	+++ b/libexec/rtld-elf/mips/rtld_machdep.h
	@@ -78,6 +78,5 @@
	#define md_abi_variant_hook(x)

	#define TLS_VARIANT_I 1
	-#define TLS_DTV_OFFSET 0

	#endif
	diff --git a/sys/mips/include/tls.h b/sys/mips/include/tls.h
	--- a/sys/mips/include/tls.h
	+++ b/sys/mips/include/tls.h
	@@ -39,7 +39,7 @@
	*/

	#define TLS_TP_OFFSET 0x7000
	-#define TLS_DTP_OFFSET 0x8000
	+#define TLS_DTV_OFFSET 0x8000

	#ifdef __mips_n64
	#define TLS_TCB_SIZE 16