From: Richard Henderson <rth@twiddle.net>
To: libc-ports@sourceware.org
Subject: [PATCH 1/2] alpha: Fix error path for PIC __brk
Date: Thu, 31 May 2012 04:04:00 -0000 [thread overview]
Message-ID: <1338437052-11536-1-git-send-email-rth@twiddle.net> (raw)
A new build of qemu, which is almost certainly buggy, fails the
first brk syscall, which lead me to discover that the error path
for brk was incorrect. The SYSCALL_ERROR_HANDLER into which it
appears that we are dropping is empty for the pic build, so we
actually drop into the next function which caused all sorts of mahem.
r~
ChangeLog.alpha | 2 ++
sysdeps/unix/sysv/linux/alpha/brk.S | 32 ++++++++++++++++++--------------
2 files changed, 20 insertions(+), 14 deletions(-)
* sysdeps/unix/sysv/linux/alpha/brk.S: Fix error path for PIC.
diff --git a/sysdeps/unix/sysv/linux/alpha/brk.S b/sysdeps/unix/sysv/linux/alpha/brk.S
index 826d737..cb759db 100644
--- a/sysdeps/unix/sysv/linux/alpha/brk.S
+++ b/sysdeps/unix/sysv/linux/alpha/brk.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Brendan Kehoe <brendan@zen.org>, 1993.
@@ -36,16 +36,22 @@ __curbrk: .skip 8
#endif
.text
-LEAF(__brk, 8)
+ .align 4
+ .globl __brk
+ .ent __brk
+ .usepv __brk, std
+
+ cfi_startproc
+__brk:
ldgp gp, 0(t12)
- subq sp, 8, sp
+ subq sp, 16, sp
+ cfi_adjust_cfa_offset (16)
#ifdef PROF
.set noat
lda AT, _mcount
jsr AT, (AT), _mcount
.set at
#endif
- .prologue 1
/* Save the requested brk across the system call. */
stq a0, 0(sp)
@@ -54,27 +60,25 @@ LEAF(__brk, 8)
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, $err1
+ bne a3, SYSCALL_ERROR_LABEL
beq v0, $ok
/* Correctly handle the brk(0) query case. */
cmoveq a0, v0, a0
xor a0, v0, t0
- bne t0, $err0
+ lda v0, ENOMEM
+ bne t0, SYSCALL_ERROR_LABEL
/* Update __curbrk and return cleanly. */
- mov zero, v0
+ lda v0, 0
$ok: stq a0, __curbrk
- addq sp, 8, sp
ret
- /* What a horrible way to die. */
-$err0: ldi v0, ENOMEM
-$err1: addq sp, 8, sp
- SYSCALL_ERROR_HANDLER
-
- END(__brk)
+PSEUDO_END(__brk)
+ cfi_endproc
weak_alias (__brk, brk)
--
1.7.7.6
next reply other threads:[~2012-05-31 4:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-31 4:04 Richard Henderson [this message]
2012-05-31 4:04 ` [PATCH 2/2] alpha: Add -mieee-with-inexact for fma compilation Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338437052-11536-1-git-send-email-rth@twiddle.net \
--to=rth@twiddle.net \
--cc=libc-ports@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).