aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/mips
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/mips
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/mips')
-rw-r--r--sysdeps/unix/sysv/linux/mips/brk.c46
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips32/sysdep.h3
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips64/sysdep.h3
3 files changed, 6 insertions, 46 deletions
diff --git a/sysdeps/unix/sysv/linux/mips/brk.c b/sysdeps/unix/sysv/linux/mips/brk.c
deleted file mode 100644
index 0335837948..0000000000
--- a/sysdeps/unix/sysv/linux/mips/brk.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* brk system call for Linux/MIPS.
- Copyright (C) 2000-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;
-
-/* Old braindamage in GCC's crtstuff.c requires this symbol in an attempt
- to work around different old braindamage in the old Linux/x86 ELF
- dynamic linker. Sigh. */
-weak_alias (__curbrk, ___brk_addr)
-
-int
-__brk (void *addr)
-{
- void *newbrk;
-
- newbrk = (void *) INTERNAL_SYSCALL_CALL (brk, addr);
- __curbrk = newbrk;
-
- if (newbrk < addr)
- {
- __set_errno (ENOMEM);
- return -1;
- }
-
- return 0;
-}
-weak_alias (__brk, brk)
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
index c5bcd90c25..49856c3249 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
@@ -43,6 +43,9 @@
#else /* ! __ASSEMBLER__ */
+#undef HAVE_INTERNAL_BRK_ADDR_SYMBOL
+#define HAVE_INTERNAL_BRK_ADDR_SYMBOL 1
+
/* Note that the original Linux syscall restart convention required the
instruction immediately preceding SYSCALL to initialize $v0 with the
syscall number. Then if a restart triggered, $v0 would have been
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep.h
index 1882fe4e73..73816816d5 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/mips/mips64/sysdep.h
@@ -41,6 +41,9 @@
#else /* ! __ASSEMBLER__ */
+#undef HAVE_INTERNAL_BRK_ADDR_SYMBOL
+#define HAVE_INTERNAL_BRK_ADDR_SYMBOL 1
+
#if _MIPS_SIM == _ABIN32
/* Convert X to a long long, without losing any bits if it is one
already or warning if it is a 32-bit pointer. */