diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-06-26 16:06:49 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-12-10 17:42:37 -0300 |
commit | 720480934ab9107714f1ffc29222dfb5d3bc5b1d (patch) | |
tree | 3851a6f8fe50b3548e667651805dadb7c242f43b /sysdeps/unix/sysv/linux/alpha | |
parent | 880433de13fa31e52587720f81b762a6c7797e4e (diff) | |
download | glibc-720480934ab9107714f1ffc29222dfb5d3bc5b1d.tar.gz glibc-720480934ab9107714f1ffc29222dfb5d3bc5b1d.tar.xz 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/alpha')
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/brk.S | 83 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/brk.c | 38 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/dl-brk.S | 1 |
3 files changed, 38 insertions, 84 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/brk.S b/sysdeps/unix/sysv/linux/alpha/brk.S deleted file mode 100644 index 5596b346d8..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/brk.S +++ /dev/null @@ -1,83 +0,0 @@ -/* Copyright (C) 1993-2020 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Brendan Kehoe <brendan@zen.org>, 1993. - - 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 3 - .globl __curbrk -__curbrk: .skip 8 - .type __curbrk,@object - .size __curbrk,8 -#else -.comm __curbrk, 8 -#endif - - .text - .align 4 - .globl __brk - .ent __brk - .usepv __brk, std - - cfi_startproc -__brk: - ldgp gp, 0(t12) - subq sp, 16, sp - cfi_adjust_cfa_offset (16) -#ifdef PROF - .set noat - lda AT, _mcount - jsr AT, (AT), _mcount - .set at -#endif - - /* Save the requested brk across the system call. */ - stq a0, 0(sp) - - ldiq v0, __NR_brk - call_pal PAL_callsys - - ldq a0, 0(sp) - addq sp, 16, sp - cfi_adjust_cfa_offset (-16) - - /* Be prepared for an OSF-style brk. */ - bne a3, SYSCALL_ERROR_LABEL - beq v0, $ok - - /* Correctly handle the brk(0) query case. */ - cmoveq a0, v0, a0 - xor a0, v0, t0 - lda v0, ENOMEM - bne t0, SYSCALL_ERROR_LABEL - - /* Update __curbrk and return cleanly. */ - lda v0, 0 -$ok: stq a0, __curbrk - ret - -PSEUDO_END(__brk) - cfi_endproc - -weak_alias (__brk, brk) diff --git a/sysdeps/unix/sysv/linux/alpha/brk.c b/sysdeps/unix/sysv/linux/alpha/brk.c new file mode 100644 index 0000000000..d105a50724 --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/brk.c @@ -0,0 +1,38 @@ +/* Change data segment size. Linux/Alpha. + Copyright (C) 2020 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 + <https://www.gnu.org/licenses/>. */ + +#include <errno.h> +#include <unistd.h> +#include <sysdep.h> + +void *__curbrk = 0; + +int +__brk (void *addr) +{ + /* Alpha brk returns -ENOMEM in case of failure. */ + __curbrk = (void *) INTERNAL_SYSCALL_CALL (brk, addr); + if ((unsigned long) __curbrk == -ENOMEM) + { + __set_errno (ENOMEM); + return -1; + } + + return 0; +} +weak_alias (__brk, brk) diff --git a/sysdeps/unix/sysv/linux/alpha/dl-brk.S b/sysdeps/unix/sysv/linux/alpha/dl-brk.S deleted file mode 100644 index eeb96544e3..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/dl-brk.S +++ /dev/null @@ -1 +0,0 @@ -#include <brk.S> |