From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 20 Feb 2004 23:36:05 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~18265
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5990e1fe120708a10ae8ab0caf4a284b5d6b10f8;p=external%2Fglibc.git

Update.

	* sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c [SHARED]: Code only
	valid for SHARED case.  Correct spelling of __vmx_longjmp.
---

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 52f6d6c..e7d0902 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-20  Steven Munroe  <sjmunroe@us.ibm.com>
 
+	* sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c [SHARED]: Code only
+	valid for SHARED case.  Correct spelling of __vmx_longjmp.
+
 	* sysdeps/powerpc/pspinlock.c: Move from here.
 	* sysdeps/powerpc/powerpc32/pspinlock.c: To here.
 	* sysdeps/powerpc/powerpc64/pspinlock.c: New file.
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c
index d22be13..177256c 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c
+++ b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c
@@ -19,7 +19,8 @@
 #include <setjmp.h>
 #include <bits/wordsize.h>
 #include <shlib-compat.h>
-#if defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4)
+#if defined SHARED
+# if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4)
 
 /* These functions are not declared anywhere since they shouldn't be
    used at another place but here.  */
@@ -39,14 +40,14 @@ void __novmx_longjmp (jmp_buf env, int val)
   __novmx__libc_longjmp (env, val);
 }
 
-# if __WORDSIZE == 64
+#  if __WORDSIZE == 64
 symbol_version (__novmx_longjmp,longjmp,GLIBC_2.3);
 symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.3);
-# else
+#  else
 symbol_version (__novmx_longjmp,longjmp,GLIBC_2.0);
 symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.0);
-# endif
-#endif  /* defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4) ) */
+#  endif
+# endif  /* SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4) ) */
 
 /* These functions are not declared anywhere since they shouldn't be
    used at another place but here.  */
@@ -55,16 +56,15 @@ extern void __vmx__libc_siglongjmp (sigjmp_buf env, int val)
 extern void __vmx__libc_longjmp (sigjmp_buf env, int val)
      __attribute__ ((noreturn));
 
-#ifdef SHARED
 void __vmx_siglongjmp (sigjmp_buf env, int val)
 {
   __vmx__libc_siglongjmp (env, val);
 }
 
-void __vmxlongjmp (jmp_buf env, int val)
+void __vmx_longjmp (jmp_buf env, int val)
 {
   __vmx__libc_longjmp (env, val);
 }
-#endif
 default_symbol_version (__vmx_longjmp,longjmp,GLIBC_2.3.4);
 default_symbol_version (__vmx_siglongjmp,siglongjmp,GLIBC_2.3.4);
+#endif /* SHARED */
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 61e57e6..b079883 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-20  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sysdeps/sh/jmpbuf-unwind.h (_JMPBUF_UNWINDS_ADJ): Fix variable name.
+
 2004-02-20  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
diff --git a/nptl/sysdeps/sh/jmpbuf-unwind.h b/nptl/sysdeps/sh/jmpbuf-unwind.h
index 0fae2c2..7e36d83 100644
--- a/nptl/sysdeps/sh/jmpbuf-unwind.h
+++ b/nptl/sysdeps/sh/jmpbuf-unwind.h
@@ -25,4 +25,4 @@
   _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
 
 #define _JMPBUF_UNWINDS_ADJ(jmpbuf, address, adj) \
-  ((uintptr_t) (address) - (adj) < (uintptr_t) (_jmpbuf)[0].__regs[7] - (adj))
+  ((uintptr_t) (address) - (adj) < (uintptr_t) (jmpbuf)[0].__regs[7] - (adj))