D19072.id.diff
No OneTemporary
Actions

Size

43 KB

Referenced Files

None

Subscribers

None

D19072.id.diff
View Options

	Index: head/lib/libc/aarch64/static_tls.h
	===================================================================
	--- head/lib/libc/aarch64/static_tls.h
	+++ head/lib/libc/aarch64/static_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _LIBC_AARCH64_STATIC_TLS_H
	+#define _LIBC_AARCH64_STATIC_TLS_H
	+
	+static __inline uintptr_t
	+_libc_get_static_tls_base(size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ __asm __volatile("mrs %x0, tpidr_el0" : "=r" (tlsbase));
	+ tlsbase += offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libc/amd64/static_tls.h
	===================================================================
	--- head/lib/libc/amd64/static_tls.h
	+++ head/lib/libc/amd64/static_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _LIBC_AMD64_STATIC_TLS_H
	+#define _LIBC_AMD64_STATIC_TLS_H
	+
	+static __inline uintptr_t
	+_libc_get_static_tls_base(size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ __asm __volatile("movq %%fs:0, %0" : "=r" (tlsbase));
	+ tlsbase -= offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libc/arm/static_tls.h
	===================================================================
	--- head/lib/libc/arm/static_tls.h
	+++ head/lib/libc/arm/static_tls.h
	@@ -0,0 +1,51 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _LIBC_ARM_STATIC_TLS_H
	+#define _LIBC_ARM_STATIC_TLS_H
	+
	+static __inline uintptr_t
	+_libc_get_static_tls_base(size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+#ifdef ARM_TP_ADDRESS
	+ tlsbase = (uintptr_t )ARM_TP_ADDRESS;
	+#else
	+ __asm __volatile("mrc p15, 0, %0, c13, c0, 3" : "=r" (tlsbase));
	+#endif
	+
	+ tlsbase += offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libc/gen/Symbol.map
	===================================================================
	--- head/lib/libc/gen/Symbol.map
	+++ head/lib/libc/gen/Symbol.map
	@@ -542,6 +542,7 @@
	__libc_tcdrain;

	__elf_aux_vector;
	+ __pthread_distribute_static_tls;
	__pthread_map_stacks_exec;
	__fillcontextx;
	__fillcontextx2;
	Index: head/lib/libc/gen/elf_utils.c
	===================================================================
	--- head/lib/libc/gen/elf_utils.c
	+++ head/lib/libc/gen/elf_utils.c
	@@ -34,10 +34,13 @@
	#include <sys/sysctl.h>
	#include <link.h>
	#include <stddef.h>
	+#include <string.h>
	#include "libc_private.h"
	+#include "static_tls.h"

	int __elf_phdr_match_addr(struct dl_phdr_info , void );
	void __pthread_map_stacks_exec(void);
	+void __pthread_distribute_static_tls(size_t, void *, size_t, size_t);

	int
	__elf_phdr_match_addr(struct dl_phdr_info phdr_info, void addr)
	@@ -96,4 +99,25 @@
	{

	((void (*)(void))__libc_interposing[INTERPOS_map_stacks_exec])();
	+}
	+
	+void
	+__libc_distribute_static_tls(size_t offset, void *src, size_t len,
	+ size_t total_len)
	+{
	+ uintptr_t tlsbase;
	+
	+ tlsbase = _libc_get_static_tls_base(offset);
	+ memcpy((void *)tlsbase, src, len);
	+ memset((char *)tlsbase + len, 0, total_len - len);
	+}
	+
	+#pragma weak __pthread_distribute_static_tls
	+void
	+__pthread_distribute_static_tls(size_t offset, void *src, size_t len,
	+ size_t total_len)
	+{
	+
	+ ((void ()(size_t, void , size_t, size_t))__libc_interposing[
	+ INTERPOS_distribute_static_tls])(offset, src, len, total_len);
	}
	Index: head/lib/libc/i386/static_tls.h
	===================================================================
	--- head/lib/libc/i386/static_tls.h
	+++ head/lib/libc/i386/static_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _LIBC_I386_STATIC_TLS_H
	+#define _LIBC_I386_STATIC_TLS_H
	+
	+static __inline uintptr_t
	+_libc_get_static_tls_base(size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ __asm __volatile("movl %%gs:0, %0" : "=r" (tlsbase));
	+ tlsbase -= offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libc/include/libc_private.h
	===================================================================
	--- head/lib/libc/include/libc_private.h
	+++ head/lib/libc/include/libc_private.h
	@@ -235,6 +235,7 @@
	INTERPOS_map_stacks_exec,
	INTERPOS_fdatasync,
	INTERPOS_clock_nanosleep,
	+ INTERPOS_distribute_static_tls,
	INTERPOS_MAX
	};

	@@ -413,6 +414,8 @@
	int __elf_phdr_match_addr(struct dl_phdr_info , void );
	void __init_elf_aux_vector(void);
	void __libc_map_stacks_exec(void);
	+void __libc_distribute_static_tls(__size_t, void *, __size_t, __size_t);
	+__uintptr_t __libc_static_tls_base(__size_t);

	void _pthread_cancel_enter(int);
	void _pthread_cancel_leave(int);
	Index: head/lib/libc/mips/static_tls.h
	===================================================================
	--- head/lib/libc/mips/static_tls.h
	+++ head/lib/libc/mips/static_tls.h
	@@ -0,0 +1,64 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _LIBC_MIPS_STATIC_TLS_H
	+#define _LIBC_MIPS_STATIC_TLS_H
	+
	+#include <machine/tls.h>
	+
	+static __inline uintptr_t
	+_libc_get_static_tls_base(size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+#if defined(__mips_n64)
	+ __asm__ __volatile__ (
	+ ".set\tpush\n\t"
	+ ".set\tmips64r2\n\t"
	+ "rdhwr\t%0, $29\n\t"
	+ ".set\tpop"
	+ : "=r" (tlsbase));
	+ tlsbase -= TLS_TP_OFFSET + TLS_TCB_SIZE;
	+#else /* mips 32 */
	+ __asm__ __volatile__ (
	+ ".set\tpush\n\t"
	+ ".set\tmips32r2\n\t"
	+ "rdhwr\t%0, $29\n\t"
	+ ".set\tpop"
	+ : "=r" (tlsbase));
	+ tlsbase -= TLS_TP_OFFSET + TLS_TCB_SIZE;
	+#endif /* ! __mips_n64 */
	+ tlsbase += offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libc/powerpc/static_tls.h
	===================================================================
	--- head/lib/libc/powerpc/static_tls.h
	+++ head/lib/libc/powerpc/static_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _LIBC_POWERPC_STATIC_TLS_H
	+#define _LIBC_POWERPC_STATIC_TLS_H
	+
	+static __inline uintptr_t
	+_libc_get_static_tls_base(size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ __asm __volatile("mr %0,2" : "=r"(tlsbase));
	+ tlsbase += offset - 0x7008;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libc/powerpc64/static_tls.h
	===================================================================
	--- head/lib/libc/powerpc64/static_tls.h
	+++ head/lib/libc/powerpc64/static_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _LIBC_POWERPC64_STATIC_TLS_H
	+#define _LIBC_POWERPC64_STATIC_TLS_H
	+
	+static __inline uintptr_t
	+_libc_get_static_tls_base(size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ __asm __volatile("mr %0,13" : "=r"(tlsbase));
	+ tlsbase += offset - 0x7010;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libc/riscv/static_tls.h
	===================================================================
	--- head/lib/libc/riscv/static_tls.h
	+++ head/lib/libc/riscv/static_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _LIBC_RISCV_STATIC_TLS_H
	+#define _LIBC_RISCV_STATIC_TLS_H
	+
	+static __inline uintptr_t
	+_libc_get_static_tls_base(size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ __asm __volatile("mv %0, tp" : "=r"(tlsbase));
	+ tlsbase += offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libc/sparc64/static_tls.h
	===================================================================
	--- head/lib/libc/sparc64/static_tls.h
	+++ head/lib/libc/sparc64/static_tls.h
	@@ -0,0 +1,44 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _LIBC_SPARC64_STATIC_TLS_H
	+#define _LIBC_SPARC64_STATIC_TLS_H
	+
	+static __inline uintptr_t
	+_libc_get_static_tls_base(size_t offset)
	+{
	+ register uintptr_t tlsbase __asm("%g7");
	+
	+ return (tlsbase + offset);
	+}
	+
	+#endif
	Index: head/lib/libc/sys/interposing_table.c
	===================================================================
	--- head/lib/libc/sys/interposing_table.c
	+++ head/lib/libc/sys/interposing_table.c
	@@ -81,6 +81,7 @@
	SLOT(map_stacks_exec, __libc_map_stacks_exec),
	SLOT(fdatasync, __sys_fdatasync),
	SLOT(clock_nanosleep, __sys_clock_nanosleep),
	+ SLOT(distribute_static_tls, __libc_distribute_static_tls),
	};
	#undef SLOT

	Index: head/lib/libthr/Makefile
	===================================================================
	--- head/lib/libthr/Makefile
	+++ head/lib/libthr/Makefile
	@@ -16,8 +16,10 @@
	NO_WTHREAD_SAFETY=1
	NO_WCAST_ALIGN.gcc=1 # for gcc 4.2
	CFLAGS+=-DPTHREAD_KERNEL
	-CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}/thread \
	- -I${SRCTOP}/include
	+CFLAGS+=-I${SRCTOP}/lib/libc/include
	+CFLAGS+=-I${SRCTOP}/lib/libc/${MACHINE_CPUARCH}
	+CFLAGS+=-I${.CURDIR}/thread
	+CFLAGS+=-I${SRCTOP}/include
	CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
	CFLAGS+=-I${.CURDIR}/sys
	CFLAGS+=-I${SRCTOP}/libexec/rtld-elf
	Index: head/lib/libthr/arch/aarch64/include/pthread_tls.h
	===================================================================
	--- head/lib/libthr/arch/aarch64/include/pthread_tls.h
	+++ head/lib/libthr/arch/aarch64/include/pthread_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _ARCH_AARCH64_PTHREAD_TLS_H
	+#define _ARCH_AARCH64_PTHREAD_TLS_H
	+
	+static __inline uintptr_t
	+_get_static_tls_base(struct pthread *thr, size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ tlsbase = (uintptr_t)thr->tcb;
	+ tlsbase += offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libthr/arch/amd64/include/pthread_tls.h
	===================================================================
	--- head/lib/libthr/arch/amd64/include/pthread_tls.h
	+++ head/lib/libthr/arch/amd64/include/pthread_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _ARCH_AMD64_PTHREAD_TLS_H
	+#define _ARCH_AMD64_PTHREAD_TLS_H
	+
	+static __inline uintptr_t
	+_get_static_tls_base(struct pthread *thr, size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ tlsbase = (uintptr_t)thr->tcb;
	+ tlsbase -= offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libthr/arch/arm/include/pthread_tls.h
	===================================================================
	--- head/lib/libthr/arch/arm/include/pthread_tls.h
	+++ head/lib/libthr/arch/arm/include/pthread_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _ARCH_ARM_PTHREAD_TLS_H
	+#define _ARCH_ARM_PTHREAD_TLS_H
	+
	+static __inline uintptr_t
	+_get_static_tls_base(struct pthread *thr, size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ tlsbase = (uintptr_t)thr->tcb;
	+ tlsbase += offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libthr/arch/i386/include/pthread_tls.h
	===================================================================
	--- head/lib/libthr/arch/i386/include/pthread_tls.h
	+++ head/lib/libthr/arch/i386/include/pthread_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _ARCH_I386_PTHREAD_TLS_H
	+#define _ARCH_I386_PTHREAD_TLS_H
	+
	+static __inline uintptr_t
	+_get_static_tls_base(struct pthread *thr, size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ tlsbase = (uintptr_t)thr->tcb;
	+ tlsbase -= offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libthr/arch/mips/include/pthread_tls.h
	===================================================================
	--- head/lib/libthr/arch/mips/include/pthread_tls.h
	+++ head/lib/libthr/arch/mips/include/pthread_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _ARCH_MIPS_PTHREAD_TLS_H
	+#define _ARCH_MIPS_PTHREAD_TLS_H
	+
	+static __inline uintptr_t
	+_get_static_tls_base(struct pthread *thr, size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ tlsbase = (uintptr_t)thr->tcb;
	+ tlsbase += offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libthr/arch/powerpc/include/pthread_tls.h
	===================================================================
	--- head/lib/libthr/arch/powerpc/include/pthread_tls.h
	+++ head/lib/libthr/arch/powerpc/include/pthread_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _ARCH_POWERPC_PTHREAD_TLS_H
	+#define _ARCH_POWERPC_PTHREAD_TLS_H
	+
	+static __inline uintptr_t
	+_get_static_tls_base(struct pthread *thr, size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ tlsbase = (uintptr_t)thr->tcb;
	+ tlsbase += offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libthr/arch/riscv/include/pthread_tls.h
	===================================================================
	--- head/lib/libthr/arch/riscv/include/pthread_tls.h
	+++ head/lib/libthr/arch/riscv/include/pthread_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _ARCH_RISCV_PTHREAD_TLS_H
	+#define _ARCH_RISCV_PTHREAD_TLS_H
	+
	+static __inline uintptr_t
	+_get_static_tls_base(struct pthread *thr, size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ tlsbase = (uintptr_t)thr->tcb;
	+ tlsbase += offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libthr/arch/sparc64/include/pthread_tls.h
	===================================================================
	--- head/lib/libthr/arch/sparc64/include/pthread_tls.h
	+++ head/lib/libthr/arch/sparc64/include/pthread_tls.h
	@@ -0,0 +1,46 @@
	+/*-
	+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
	+ *
	+ * Copyright (c) 2019 The FreeBSD Foundation
	+ *
	+ * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
	+ * under sponsorship from the FreeBSD Foundation.
	+ *
	+ * Redistribution and use in source and binary forms, with or without
	+ * modification, are permitted provided that the following conditions
	+ * are met:
	+ * 1. Redistributions of source code must retain the above copyright
	+ * notice, this list of conditions and the following disclaimer.
	+ * 2. Redistributions in binary form must reproduce the above copyright
	+ * notice, this list of conditions and the following disclaimer in the
	+ * documentation and/or other materials provided with the distribution.
	+ *
	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	+ * SUCH DAMAGE.
	+ *
	+ * $FreeBSD$
	+ */
	+
	+#ifndef _ARCH_SPARC64_PTHREAD_TLS_H
	+#define _ARCH_SPARC64_PTHREAD_TLS_H
	+
	+static __inline uintptr_t
	+_get_static_tls_base(struct pthread *thr, size_t offset)
	+{
	+ uintptr_t tlsbase;
	+
	+ tlsbase = (uintptr_t)thr->tcb;
	+ tlsbase -= offset;
	+ return (tlsbase);
	+}
	+
	+#endif
	Index: head/lib/libthr/pthread.map
	===================================================================
	--- head/lib/libthr/pthread.map
	+++ head/lib/libthr/pthread.map
	@@ -137,6 +137,7 @@
	__pthread_mutex_lock;
	__pthread_mutex_timedlock;
	__pthread_mutex_trylock;
	+ __pthread_distribute_static_tls;
	_pthread_atfork;
	_pthread_barrier_destroy;
	_pthread_barrier_init;
	Index: head/lib/libthr/thread/thr_list.c
	===================================================================
	--- head/lib/libthr/thread/thr_list.c
	+++ head/lib/libthr/thread/thr_list.c
	@@ -39,6 +39,7 @@

	#include "libc_private.h"
	#include "thr_private.h"
	+#include "static_tls.h"

	/#define DEBUG_THREAD_LIST /
	#ifdef DEBUG_THREAD_LIST
	@@ -361,4 +362,36 @@
	}
	THREAD_LIST_UNLOCK(curthread);
	return (ret);
	+}
	+
	+#include "pthread_tls.h"
	+
	+static void
	+thr_distribute_static_tls(uintptr_t tlsbase, void *src, size_t len,
	+ size_t total_len)
	+{
	+
	+ memcpy((void *)tlsbase, src, len);
	+ memset((char *)tlsbase + len, 0, total_len - len);
	+}
	+
	+void
	+__pthread_distribute_static_tls(size_t offset, void *src, size_t len,
	+ size_t total_len)
	+{
	+ struct pthread curthread, thrd;
	+ uintptr_t tlsbase;
	+
	+ if (!_thr_is_inited()) {
	+ tlsbase = _libc_get_static_tls_base(offset);
	+ thr_distribute_static_tls(tlsbase, src, len, total_len);
	+ return;
	+ }
	+ curthread = _get_curthread();
	+ THREAD_LIST_RDLOCK(curthread);
	+ TAILQ_FOREACH(thrd, &_thread_list, tle) {
	+ tlsbase = _get_static_tls_base(thrd, offset);
	+ thr_distribute_static_tls(tlsbase, src, len, total_len);
	+ }
	+ THREAD_LIST_UNLOCK(curthread);
	}
	Index: head/lib/libthr/thread/thr_private.h
	===================================================================
	--- head/lib/libthr/thread/thr_private.h
	+++ head/lib/libthr/thread/thr_private.h
	@@ -973,6 +973,8 @@
	void _thr_tsd_unload(struct dl_phdr_info *phdr_info) __hidden;
	void _thr_sigact_unload(struct dl_phdr_info *phdr_info) __hidden;
	void _thr_stack_fix_protection(struct pthread *thrd);
	+void __pthread_distribute_static_tls(size_t offset, void *src, size_t len,
	+ size_t total_len);

	int *__error_threaded(void) __hidden;
	void __thr_interpose_libc(void) __hidden;
	Index: head/libexec/rtld-elf/rtld.h
	===================================================================
	--- head/libexec/rtld-elf/rtld.h
	+++ head/libexec/rtld-elf/rtld.h
	@@ -256,6 +256,8 @@
	bool z_interpose : 1; /* Interpose all objects but main */
	bool z_nodeflib : 1; /* Don't search default library path */
	bool z_global : 1; /* Make the object global */
	+ bool static_tls : 1; /* Needs static TLS allocation */
	+ bool static_tls_copied : 1; /* Needs static TLS copying */
	bool ref_nodel : 1; /* Refcount increased to prevent dlclose */
	bool init_scanned: 1; /* Object is already on init list. */
	bool on_fini_list: 1; /* Object is already on fini list. */
	Index: head/libexec/rtld-elf/rtld.c
	===================================================================
	--- head/libexec/rtld-elf/rtld.c
	+++ head/libexec/rtld-elf/rtld.c
	@@ -92,6 +92,7 @@
	const Elf_Dyn *);
	static void digest_dynamic(Obj_Entry *, int);
	static Obj_Entry digest_phdr(const Elf_Phdr , int, caddr_t, const char *);
	+static void distribute_static_tls(Objlist , RtldLockState );
	static Obj_Entry dlcheck(void );
	static int dlclose_locked(void , RtldLockState );
	static Obj_Entry dlopen_object(const char name, int fd, Obj_Entry *refobj,
	@@ -1247,8 +1248,8 @@
	obj->textrel = true;
	if (dynp->d_un.d_val & DF_BIND_NOW)
	obj->bind_now = true;
	- /*if (dynp->d_un.d_val & DF_STATIC_TLS)
	- ;*/
	+ if (dynp->d_un.d_val & DF_STATIC_TLS)
	+ obj->static_tls = true;
	break;
	#ifdef __mips__
	case DT_MIPS_LOCAL_GOTNO:
	@@ -3330,8 +3331,16 @@
	if (globallist_next(old_obj_tail) != NULL) {
	/* We loaded something new. */
	assert(globallist_next(old_obj_tail) == obj);
	- result = load_needed_objects(obj,
	- lo_flags & (RTLD_LO_DLOPEN \| RTLD_LO_EARLY));
	+ result = 0;
	+ if ((lo_flags & RTLD_LO_EARLY) == 0 && obj->static_tls &&
	+ !allocate_tls_offset(obj)) {
	+ _rtld_error("%s: No space available "
	+ "for static Thread Local Storage", obj->path);
	+ result = -1;
	+ }
	+ if (result != -1)
	+ result = load_needed_objects(obj, lo_flags & (RTLD_LO_DLOPEN \|
	+ RTLD_LO_EARLY));
	init_dag(obj);
	ref_dag(obj);
	if (result != -1)
	@@ -3391,8 +3400,10 @@
	name);
	GDB_STATE(RT_CONSISTENT,obj ? &obj->linkmap : NULL);

	- if (!(lo_flags & RTLD_LO_EARLY)) {
	+ if ((lo_flags & RTLD_LO_EARLY) == 0) {
	map_stacks_exec(lockstate);
	+ if (obj != NULL)
	+ distribute_static_tls(&initlist, lockstate);
	}

	if (initlist_objects_ifunc(&initlist, (mode & RTLD_MODEMASK) == RTLD_NOW,
	@@ -4917,8 +4928,10 @@
	addr = segbase - obj->tlsoffset;
	memset((void*)(addr + obj->tlsinitsize),
	0, obj->tlssize - obj->tlsinitsize);
	- if (obj->tlsinit)
	+ if (obj->tlsinit) {
	memcpy((void*) addr, obj->tlsinit, obj->tlsinitsize);
	+ obj->static_tls_copied = true;
	+ }
	dtv[obj->tlsindex + 1] = addr;
	}
	}
	@@ -5377,6 +5390,27 @@
	if (thr_map_stacks_exec != NULL) {
	stack_prot \|= PROT_EXEC;
	thr_map_stacks_exec();
	+ }
	+}
	+
	+static void
	+distribute_static_tls(Objlist list, RtldLockState lockstate)
	+{
	+ Objlist_Entry *elm;
	+ Obj_Entry *obj;
	+ void (distrib)(size_t, void , size_t, size_t);
	+
	+ distrib = (void ()(size_t, void , size_t, size_t))(uintptr_t)
	+ get_program_var_addr("__pthread_distribute_static_tls", lockstate);
	+ if (distrib == NULL)
	+ return;
	+ STAILQ_FOREACH(elm, list, link) {
	+ obj = elm->obj;
	+ if (obj->marker \|\| !obj->tls_done \|\| obj->static_tls_copied)
	+ continue;
	+ distrib(obj->tlsoffset, obj->tlsinit, obj->tlsinitsize,
	+ obj->tlssize);
	+ obj->static_tls_copied = true;
	}
	}

File Metadata

Mime Type: text/plain
Expires: Wed, Oct 22, 4:30 PM (8 h, 22 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 24040304
Default Alt Text: D19072.id.diff (43 KB)

D19072.id.diffNo OneTemporaryActions

D19072.id.diffView Options

File Metadata

Event Timeline

D19072.id.diff
No OneTemporary
Actions

D19072.id.diff
View Options