aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysdeps/x86/nptl/pthreaddef.h (renamed from sysdeps/i386/nptl/pthreaddef.h)8
-rw-r--r--sysdeps/x86_64/nptl/pthreaddef.h47
2 files changed, 7 insertions, 48 deletions
diff --git a/sysdeps/i386/nptl/pthreaddef.h b/sysdeps/x86/nptl/pthreaddef.h
index a488cac603..6ff7d601eb 100644
--- a/sysdeps/i386/nptl/pthreaddef.h
+++ b/sysdeps/x86/nptl/pthreaddef.h
@@ -40,4 +40,10 @@
/* Location of current stack frame. */
-#define CURRENT_STACK_FRAME __builtin_frame_address (0)
+#ifdef __x86_64__
+/* The frame pointer is not usable. */
+# define CURRENT_STACK_FRAME \
+ ({ register char *frame __asm__("rsp"); frame; })
+#else
+# define CURRENT_STACK_FRAME __builtin_frame_address (0)
+#endif
diff --git a/sysdeps/x86_64/nptl/pthreaddef.h b/sysdeps/x86_64/nptl/pthreaddef.h
deleted file mode 100644
index a8b5fa4c45..0000000000
--- a/sysdeps/x86_64/nptl/pthreaddef.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 2002-2021 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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
- <https://www.gnu.org/licenses/>. */
-
-/* Default stack size. */
-#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024)
-
-/* Minimum guard size. */
-#define ARCH_MIN_GUARD_SIZE 0
-
-/* Required stack pointer alignment at beginning. SSE requires 16
- bytes. */
-#define STACK_ALIGN 16
-
-/* Minimal stack size after allocating thread descriptor and guard size. */
-#define MINIMAL_REST_STACK 2048
-
-/* Alignment requirement for TCB.
-
- We need to store post-AVX vector registers in the TCB and we want the
- storage to be aligned to at least 32 bytes.
-
- Some processors such as Intel Atom pay a big penalty on every
- access using a segment override if that segment's base is not
- aligned to the size of a cache line. (See Intel 64 and IA-32
- Architectures Optimization Reference Manual, section 13.3.3.3,
- "Segment Base".) On such machines, a cache line is 64 bytes. */
-#define TCB_ALIGNMENT 64
-
-
-/* Location of current stack frame. The frame pointer is not usable. */
-#define CURRENT_STACK_FRAME \
- ({ register char *frame __asm__("rsp"); frame; })