[PATCH 1/2] alpha: Fix error path for PIC __brk

[PATCH 1/2] alpha: Fix error path for PIC __brk

[Richard Henderson]

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

[PATCH 2/2] alpha: Add -mieee-with-inexact for fma compilation

[Richard Henderson]

Thanks for pointing out the forgotten fma correction, Joseph.


r~


 ChangeLog.alpha                  |    4 ++++
 sysdeps/alpha/Makefile           |    6 ++++++
 sysdeps/alpha/fpu/libm-test-ulps |   14 --------------
 3 files changed, 10 insertions(+), 14 deletions(-)

	* sysdeps/alpha/Makefile (CFLAGS-s_fma.c): Set -mieee-with-inexact.
	(CFLAGS-s_fmaf.c): Likewise.
	* sysdeps/alpha/fpu/libm-test-ulps: Regenerate.
 
diff --git a/sysdeps/alpha/Makefile b/sysdeps/alpha/Makefile
index b08f69d..17fd3b8 100644
--- a/sysdeps/alpha/Makefile
+++ b/sysdeps/alpha/Makefile
@@ -37,6 +37,12 @@ ifeq ($(subdir),elf)
 CFLAGS-rtld.c = -mbuild-constants
 endif
 
+ifeq ($(subdir),math)
+# The fma routines rely on inexact being raised for correct results.
+CFLAGS-s_fma.c = -mieee-with-inexact
+CFLAGS-s_fmaf.c = -mieee-with-inexact
+endif
+
 # Build everything with full IEEE math support, and with dynamic rounding;
 # there are a number of math routines that are defined to work with the
 # "current" rounding mode, and it's easiest to set this with all of them.
diff --git a/sysdeps/alpha/fpu/libm-test-ulps b/sysdeps/alpha/fpu/libm-test-ulps
index 3988426..908154c 100644
--- a/sysdeps/alpha/fpu/libm-test-ulps
+++ b/sysdeps/alpha/fpu/libm-test-ulps
@@ -1615,20 +1615,6 @@ Test "expm1 (500.0) == 1.4035922178528374107397703328409120821806e+217":
 double: 1
 idouble: 1
 
-# fma
-Test "fma (-0x1.19cab66d73e17p-959, 0x1.c7108a8c5ff51p-107, -0x0.80b0ad65d9b64p-1022) == -0x0.80b0ad65d9d59p-1022":
-double: 1
-idouble: 1
-Test "fma (0x1.0000002p+0, 0x1.ffffffcp-1, -0x1p-300) == 0x1.fffffffffffffp-1":
-double: 1
-idouble: 1
-Test "fma (0x1.153d650bb9f06p-907, 0x1.2d01230d48407p-125, -0x0.b278d5acfc3cp-1022) == -0x0.b22757123bbe9p-1022":
-double: 1
-idouble: 1
-Test "fma (0x1.4000004p-967, 0x1p-106, 0x0.000001p-1022) == 0x0.0000010000003p-1022":
-double: 1
-idouble: 1
-
 # gamma
 Test "gamma (-0.5) == log(2*sqrt(pi))":
 ildouble: 1
-- 
1.7.7.6