From a334319f6530564d22e775935d9c91663623a1b4 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 22 Dec 2004 20:10:10 +0000
Subject: (CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.

---
 sysdeps/sh/sh3/__longjmp.S | 23 +++++------------------
 sysdeps/sh/sh3/setjmp.S    | 29 ++++++-----------------------
 2 files changed, 11 insertions(+), 41 deletions(-)

(limited to 'sysdeps/sh/sh3')

diff --git a/sysdeps/sh/sh3/__longjmp.S b/sysdeps/sh/sh3/__longjmp.S
index c6d8a3214c..cd78cfe516 100644
--- a/sysdeps/sh/sh3/__longjmp.S
+++ b/sysdeps/sh/sh3/__longjmp.S
@@ -1,5 +1,5 @@
 /* longjmp for SH.
-   Copyright (C) 1999, 2000, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 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
@@ -30,28 +30,15 @@ ENTRY (__longjmp)
 	mov.l	@r4+, r10
 	mov.l	@r4+, r11
 	mov.l	@r4+, r12
+	mov.l	@r4+, r13
+	mov.l	@r4+, r14
+	mov.l	@r4+, r15
 	mov	r5, r0		/* get the return value in place */
 	tst	r0, r0
 	bf.s	1f
-	 mov.l	@r4+, r13
+	 lds.l	@r4+, pr
 	mov	#1,r0		/* can't let setjmp() return zero! */
 1:
-#ifdef PTR_DEMANGLE
-	mov.l	@r4+, r2
-	PTR_DEMANGLE (r2, r1)
-	mov	r2, r14
-	mov.l	@r4+, r2
-	PTR_DEMANGLE2 (r2, r1)
-	mov	r2, r15
-	mov.l	@r4+, r2
-	PTR_DEMANGLE2 (r2, r1)
-	lds	r2, pr
-	mov	#0, r1
-#else
-	mov.l	@r4+, r14
-	mov.l	@r4+, r15
-	lds.l	@r4+, pr
-#endif
 	rts
 	 ldc.l	@r4+, gbr
 END (__longjmp)
diff --git a/sysdeps/sh/sh3/setjmp.S b/sysdeps/sh/sh3/setjmp.S
index d04e4b851f..819543a08c 100644
--- a/sysdeps/sh/sh3/setjmp.S
+++ b/sysdeps/sh/sh3/setjmp.S
@@ -1,5 +1,5 @@
 /* setjmp for SH3.
-   Copyright (C) 1999, 2000, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 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
@@ -18,28 +18,17 @@
    02111-1307 USA.  */
 
 #include <sysdep.h>
-#include <jmpbuf-offsets.h>
+#define _SETJMP_H
+#define _ASM
+#include <bits/setjmp.h>
 
 ENTRY (__sigsetjmp)
 	/* Save registers */
 	add	#(JB_SIZE - 4 * 5), r4
 	stc.l	gbr, @-r4
-#ifdef PTR_MANGLE
-	sts	pr, r2
-	PTR_MANGLE (r2, r1)
-	mov.l	r2, @-r4
-	mov	r15, r2
-	PTR_MANGLE2 (r2, r1)
-	mov.l	r2, @-r4
-	mov	r14, r2
-	PTR_MANGLE2 (r2, r1)
-	mov.l	r2, @-r4
-	mov	#0, r1
-#else
 	sts.l	pr, @-r4
 	mov.l	r15, @-r4
 	mov.l	r14, @-r4
-#endif
 	mov.l	r13, @-r4
 	mov.l	r12, @-r4
 	mov.l	r11, @-r4
@@ -47,13 +36,8 @@ ENTRY (__sigsetjmp)
 	mov.l	r9, @-r4
 	mov.l	r8, @-r4
 
-#if defined NOT_IN_libc && defined IS_IN_rtld
-	/* In ld.so we never save the signal mask.  */
-	rts
-	 mov	#0, r0
-#else
 	/* Make a tail call to __sigjmp_save; it takes the same args.  */
-# ifdef SHARED
+#ifdef SHARED
 	mov.l	1f, r1
 	mova	1f, r0
 	bra	2f
@@ -69,13 +53,12 @@ ENTRY (__sigsetjmp)
 	.align	2
 .L1:
 	.long	C_SYMBOL_NAME(__sigjmp_save@GOT)
-# else
+#else
 	mov.l	.L1, r1
 	jmp	@r1
 	 nop
 	.align	2
 .L1:
 	.long	C_SYMBOL_NAME(__sigjmp_save)
-# endif
 #endif
 END (__sigsetjmp)
-- 
cgit 1.4.1