aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/sparc
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-06-26 16:06:49 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-12-10 17:42:37 -0300
commit720480934ab9107714f1ffc29222dfb5d3bc5b1d (patch)
tree3851a6f8fe50b3548e667651805dadb7c242f43b /sysdeps/unix/sysv/linux/sparc
parent880433de13fa31e52587720f81b762a6c7797e4e (diff)
downloadglibc-720480934ab9107714f1ffc29222dfb5d3bc5b1d.tar
glibc-720480934ab9107714f1ffc29222dfb5d3bc5b1d.tar.gz
glibc-720480934ab9107714f1ffc29222dfb5d3bc5b1d.tar.bz2
glibc-720480934ab9107714f1ffc29222dfb5d3bc5b1d.zip
linux: Consolidate brk implementation
It removes all the arch-specific assembly implementation. The outliers are alpha, where its kernel ABI explict return -ENOMEM in case of failure; and i686, where it can't use "call *%gs:SYSINFO_OFFSET" during statup in static PIE. Also some ABIs exports an additional ___brk_addr symbol and to handle it an internal HAVE_INTERNAL_BRK_ADDR_SYMBOL is added. Checked on x86_64-linux-gnu, i686-linux-gnu, adn with builsd for the affected ABIs. Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/sparc')
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/brk.c54
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h3
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/brk.S104
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/dl-brk.S1
4 files changed, 3 insertions, 159 deletions
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/brk.c b/sysdeps/unix/sysv/linux/sparc/sparc32/brk.c
deleted file mode 100644
index ba9a616f74..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/brk.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* brk system call for Linux/SPARC.
- Copyright (C) 1995-2020 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Miguel de Icaza (miguel@nuclecu.unam.mx)
-
- 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/>. */
-
-#include <errno.h>
-#include <unistd.h>
-#include <sysdep.h>
-
-/* This must be initialized data because commons can't have aliases. */
-void *__curbrk = 0;
-
-/* Old braindamage in GCC's crtstuff.c requires this symbol in an attempt
- to work around different old braindamage in the old Linux ELF dynamic
- linker. */
-weak_alias (__curbrk, ___brk_addr)
-
-int
-__brk (void *addr)
-{
- void *newbrk;
-
- {
- register void *o0 __asm__("%o0") = addr;
- register int g1 __asm__("%g1") = __NR_brk;
- __asm ("t 0x10" : "=r"(o0) : "r"(g1), "0"(o0) : "cc");
- newbrk = o0;
- }
-
- __curbrk = newbrk;
-
- if (newbrk < addr)
- {
- __set_errno (ENOMEM);
- return -1;
- }
-
- return 0;
-}
-weak_alias (__brk, brk)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
index 2c3754770b..018ee5781e 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
@@ -121,6 +121,9 @@ ENTRY(name); \
"f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", \
"cc", "memory"
+#undef HAVE_INTERNAL_BRK_ADDR_SYMBOL
+#define HAVE_INTERNAL_BRK_ADDR_SYMBOL 1
+
#endif /* __ASSEMBLER__ */
/* Pointer mangling support. */
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S b/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S
deleted file mode 100644
index 471da3d268..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright (C) 1997-2020 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Richard Henderson <richard@gnu.ai.mit.edu>, 1997.
-
- 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/>. */
-
-/* __brk is a special syscall under Linux since it never returns an
- error. Instead, the error condition is indicated by returning the old
- break value (instead of the new, requested one). */
-
-#include <sysdep.h>
-#include <errno.h>
-
-#ifdef PIC
-.section .bss
- .align 8
- .globl __curbrk
-__curbrk: .skip 8
- .type __curbrk,@object
- .size __curbrk,8
-#else
-.common __curbrk, 8, 8
-#endif
-
- .text
-ENTRY (__brk)
- save %sp, -192, %sp
- cfi_def_cfa_register(%fp)
- cfi_window_save
- cfi_register(%o7, %i7)
-#ifdef PIC
- SETUP_PIC_REG(l7)
-#endif
-
- LOADSYSCALL(brk)
- mov %i0, %o0
-
- ta 0x6d
-
- /* All the ways we can fail... */
- bcs,pn %xcc, .Lerr1
- nop
- brz,pt %i0, .Lok
- subcc %i0, %o0, %g0
- bne,pn %xcc, .Lerr0
- nop
-
- /* Update __curbrk and return cleanly. */
-.Lok:
-#ifndef PIC
- sethi %hi(__curbrk), %g1
- or %g1, %lo(__curbrk), %g1
-#else
- sethi %gdop_hix22(__curbrk), %g1
- xor %g1, %gdop_lox10(__curbrk), %g1
- ldx [%l7 + %g1], %g1, %gdop(__curbrk)
-#endif
- stx %o0, [%g1]
- mov %g0, %i0
-
- /* Don't use "ret" cause the preprocessor will eat it. */
- jmpl %i7+8, %g0
- restore
-
- /* What a horrible way to die. */
-.Lerr0: set ENOMEM, %o0
-.Lerr1:
-#ifndef _LIBC_REENTRANT
-#ifndef PIC
- sethi %hi(errno), %g1
- or %g1, %lo(errno), %g1
-#else
- sethi %gdop_hix22(errno), %g1
- xor %g1, %gdop_lox10(errno), %g1
- ldx [%l7 + %g1], %g1, %gdop(errno)
-#endif
- st %o0, [%g1]
-#else
-#if IS_IN (libc)
- call HIDDEN_JUMPTARGET(__errno_location)
-#else
- call __errno_location
-#endif
- mov %o0,%l1
- st %l1, [%o0]
-#endif
- sub %g0, 1, %i0
- jmpl %i7+8, %g0
- restore
-END (__brk)
-
-weak_alias (__brk, brk)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-brk.S b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-brk.S
deleted file mode 100644
index eeb96544e3..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-brk.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <brk.S>