summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/i386/brk.c
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-10-14 03:45:32 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-10-14 03:45:46 -0700
commit8f763b04a0249d5a94a667da31294dd2395ec3bf (patch)
tree81bb68b3bb690c09e2e61eb197e24dcff78f04d6 /sysdeps/unix/sysv/linux/i386/brk.c
parentd7025badd8bae7ff8bc37551d868a22832a7bc94 (diff)
downloadglibc-8f763b04a0249d5a94a667da31294dd2395ec3bf.tar.gz
glibc-8f763b04a0249d5a94a667da31294dd2395ec3bf.tar.xz
glibc-8f763b04a0249d5a94a667da31294dd2395ec3bf.zip
Use INTERNAL_SYSCALL and INLINE_SYSCALL_ERROR_RETURN_VALUE
This patch uses INTERNAL_SYSCALL and INLINE_SYSCALL_ERROR_RETURN_VALUE
to avoid reading and writing errno directly so that we don't need to
call __x86.get_pc_thunk.reg to load PC into reg in case there is an
error.

	* sysdeps/unix/sysv/linux/i386/brk.c (__brk): Use
	INLINE_SYSCALL_ERROR_RETURN_VALUE.
	* sysdeps/unix/sysv/linux/i386/fxstatat.c (__fxstatat):
	Likewise.
	* sysdeps/unix/sysv/linux/i386/setegid.c (setegid): Likewise.
	* sysdeps/unix/sysv/linux/i386/seteuid.c (seteuid): Likewise.
	* sysdeps/unix/sysv/linux/i386/fxstat.c (__fxstat): Use
	INTERNAL_SYSCALLINTERNAL_SYSCALL and
	INLINE_SYSCALL_ERROR_RETURN_VALUE.
	* sysdeps/unix/sysv/linux/i386/lockf64.c (lockf64): Likewise.
	* sysdeps/unix/sysv/linux/i386/lxstat.c (__lxstat): Likewise.
	* sysdeps/unix/sysv/linux/i386/sigaction.c (__libc_sigaction):
	Likewise.
	* sysdeps/unix/sysv/linux/i386/xstat.c (__xstat): Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/brk.c')
-rw-r--r--sysdeps/unix/sysv/linux/i386/brk.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/brk.c b/sysdeps/unix/sysv/linux/i386/brk.c
index 5b9a0ce735..e360664039 100644
--- a/sysdeps/unix/sysv/linux/i386/brk.c
+++ b/sysdeps/unix/sysv/linux/i386/brk.c
@@ -31,19 +31,11 @@ weak_alias (__curbrk, ___brk_addr)
 int
 __brk (void *addr)
 {
-  void *newbrk;
-
   INTERNAL_SYSCALL_DECL (err);
-  newbrk = (void *) INTERNAL_SYSCALL (brk, err, 1, addr);
-
+  void *newbrk = (void *) INTERNAL_SYSCALL (brk, err, 1, addr);
   __curbrk = newbrk;
-
   if (newbrk < addr)
-    {
-      __set_errno (ENOMEM);
-      return -1;
-    }
-
+    return INLINE_SYSCALL_ERROR_RETURN_VALUE (ENOMEM);
   return 0;
 }
 weak_alias (__brk, brk)