From d08ae9c3fbf583508c300c7fa59ce6a05a8a47b6 Mon Sep 17 00:00:00 2001 From: Sergey Bugaev Date: Sun, 12 Feb 2023 14:10:42 +0300 Subject: hurd, htl: Add some x86_64-specific code Signed-off-by: Sergey Bugaev Message-Id: <20230212111044.610942-12-bugaevc@gmail.com> --- sysdeps/mach/hurd/x86_64/static-start.S | 27 +++++++++++++++++++++++++++ sysdeps/mach/hurd/x86_64/tlsdesc.sym | 22 ++++++++++++++++++++++ sysdeps/x86_64/htl/machine-sp.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 sysdeps/mach/hurd/x86_64/static-start.S create mode 100644 sysdeps/mach/hurd/x86_64/tlsdesc.sym create mode 100644 sysdeps/x86_64/htl/machine-sp.h diff --git a/sysdeps/mach/hurd/x86_64/static-start.S b/sysdeps/mach/hurd/x86_64/static-start.S new file mode 100644 index 0000000000..982d3d52e4 --- /dev/null +++ b/sysdeps/mach/hurd/x86_64/static-start.S @@ -0,0 +1,27 @@ +/* Startup code for statically linked Hurd/x86_64 binaries. + Copyright (C) 1998-2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + + .text + .globl _start +_start: + call _hurd_stack_setup + xorq %rdx, %rdx + jmp _start1 + +#define _start _start1 +#include diff --git a/sysdeps/mach/hurd/x86_64/tlsdesc.sym b/sysdeps/mach/hurd/x86_64/tlsdesc.sym new file mode 100644 index 0000000000..da3b96c1cc --- /dev/null +++ b/sysdeps/mach/hurd/x86_64/tlsdesc.sym @@ -0,0 +1,22 @@ +#include +#include +#include +#include +#include + +-- + +-- We have to override sysdeps/x86_64/tlsdesc.sym to adapt to our libpthread. + +-- Abuse tls.h macros to derive offsets relative to the thread register. + +DTV_OFFSET offsetof(tcbhead_t, dtv) + +TLSDESC_ARG offsetof(struct tlsdesc, arg) + +TLSDESC_GEN_COUNT offsetof(struct tlsdesc_dynamic_arg, gen_count) +TLSDESC_MODID offsetof(struct tlsdesc_dynamic_arg, tlsinfo.ti_module) +TLSDESC_MODOFF offsetof(struct tlsdesc_dynamic_arg, tlsinfo.ti_offset) + +TI_MODULE_OFFSET offsetof(tls_index, ti_module) +TI_OFFSET_OFFSET offsetof(tls_index, ti_offset) diff --git a/sysdeps/x86_64/htl/machine-sp.h b/sysdeps/x86_64/htl/machine-sp.h new file mode 100644 index 0000000000..7ae1c94108 --- /dev/null +++ b/sysdeps/x86_64/htl/machine-sp.h @@ -0,0 +1,29 @@ +/* Machine-specific function to return the stack pointer. x86_64 version. + Copyright (C) 1994-2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _MACHINE_SP_H +#define _MACHINE_SP_H + +/* Return the current stack pointer. */ + +#define __thread_stack_pointer() ({ \ + register uintptr_t __sp__ asm("rsp"); \ + __sp__; \ +}) + +#endif /* machine-sp.h */ -- cgit 1.4.1