about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-12-15 11:40:22 +0000
committerRoland McGrath <roland@gnu.org>2002-12-15 11:40:22 +0000
commit48b8ea659b928b765e904c1e79cc77a28748c03c (patch)
treed550ae227709d5561e81467244204e74eb3e3fca
parent0d5f4929fe3cfb08225d8762a047c9661fcf8712 (diff)
downloadglibc-48b8ea659b928b765e904c1e79cc77a28748c03c.tar.gz
glibc-48b8ea659b928b765e904c1e79cc77a28748c03c.tar.xz
glibc-48b8ea659b928b765e904c1e79cc77a28748c03c.zip
2002-12-14 Olaf Hering <olh@suse.de>
        * sysdeps/powerpc/bits/setjmp.h: Include <bits/wordsize.h>.
        * sysdeps/powerpc/powerpc64/setjmp.S: Fix typo in r18 load.
-rw-r--r--sysdeps/powerpc/bits/setjmp.h2
-rw-r--r--sysdeps/powerpc/powerpc64/setjmp.S7
2 files changed, 5 insertions, 4 deletions
diff --git a/sysdeps/powerpc/bits/setjmp.h b/sysdeps/powerpc/bits/setjmp.h
index 3a0a0a0d61..e17bde1351 100644
--- a/sysdeps/powerpc/bits/setjmp.h
+++ b/sysdeps/powerpc/bits/setjmp.h
@@ -27,6 +27,8 @@
    assembler easier. Naturally, user code should not depend on
    either representation. */
 
+#include <bits/wordsize.h>
+
 #if defined __USE_MISC || defined _ASM
 # define JB_GPR1   0  /* Also known as the stack pointer */
 # define JB_GPR2   1
diff --git a/sysdeps/powerpc/powerpc64/setjmp.S b/sysdeps/powerpc/powerpc64/setjmp.S
index 35d2a2790a..e13f7b4e2b 100644
--- a/sysdeps/powerpc/powerpc64/setjmp.S
+++ b/sysdeps/powerpc/powerpc64/setjmp.S
@@ -1,6 +1,6 @@
 /* setjmp for PowerPC64.
-   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002 
-   Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002
+   	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
@@ -42,7 +42,7 @@ ___sigsetjmp:
 	std  r0,(JB_CR*8)(3)
 	std  r17,((JB_GPRS+3)*8)(3)
 	stfd fp17,((JB_FPRS+3)*8)(3)
-	std  r18,((JB_GPRS+8)*8)(3)
+	std  r18,((JB_GPRS+4)*8)(3)
 	stfd fp18,((JB_FPRS+4)*8)(3)
 	std  r19,((JB_GPRS+5)*8)(3)
 	stfd fp19,((JB_FPRS+5)*8)(3)
@@ -84,4 +84,3 @@ ENTRY (BP_SYM (__setjmp))
 END (BP_SYM (__setjmp))
 
 strong_alias (__setjmp, setjmp)
-