aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--sysdeps/powerpc/longjmp.c4
-rw-r--r--sysdeps/powerpc/novmxsetjmp.h2
-rw-r--r--sysdeps/powerpc/powerpc32/setjmp.S3
-rw-r--r--sysdeps/powerpc/powerpc64/setjmp.S3
5 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 143eb14..c484513 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2004-03-11 Jakub Jelinek <jakub@redhat.com>
+ * sysdeps/powerpc/powerpc32/__longjmp.S (JB_SIZE): Undefine before
+ including __longjmp-common.S again.
+ * sysdeps/powerpc/powerpc64/__longjmp.S (JB_SIZE): Likewise.
+ * sysdeps/powerpc/powerpc32/setjmp.S (JB_SIZE): Undefine before
+ including setjmp-common.S again.
+ * sysdeps/powerpc/powerpc64/setjmp.S (JB_SIZE): Likewise.
+ * sysdeps/powerpc/novmxsetjmp.h (__novmx__longjmp): Fix type of
+ first argument in the prototype.
+ * sysdeps/powerpc/longjmp.c (__vmx__longjmp, __vmx__libc_longjmp):
+ Remove bogus semicolons.
+
* sysdeps/s390/dl-tls.h: Only add __tls_get_offset assembly if
IS_IN_rtld.
(__TLS_GET_ADDR): Use __tls_get_offset, not __tls_get_addr.
diff --git a/sysdeps/powerpc/longjmp.c b/sysdeps/powerpc/longjmp.c
index e2d7556..6d79f04 100644
--- a/sysdeps/powerpc/longjmp.c
+++ b/sysdeps/powerpc/longjmp.c
@@ -24,9 +24,9 @@
#include <setjmp.h>
#include <signal.h>
-extern void __vmx__longjmp (__jmp_buf __env, int __val);
+extern void __vmx__longjmp (__jmp_buf __env, int __val)
__attribute__ ((noreturn));
-extern void __vmx__libc_longjmp (sigjmp_buf env, int val);
+extern void __vmx__libc_longjmp (sigjmp_buf env, int val)
__attribute__ ((noreturn));
libc_hidden_proto (__vmx__libc_longjmp)
diff --git a/sysdeps/powerpc/novmxsetjmp.h b/sysdeps/powerpc/novmxsetjmp.h
index da2a338..1c46a77 100644
--- a/sysdeps/powerpc/novmxsetjmp.h
+++ b/sysdeps/powerpc/novmxsetjmp.h
@@ -108,7 +108,7 @@ extern void __novmxsiglongjmp (__novmx__sigjmp_buf __env, int __val)
__attribute__ ((__noreturn__));
/* Internal machine-dependent function to restore context sans signal mask. */
-extern void __novmx__longjmp (__novmx__jmp_buf __env, int __val)
+extern void __novmx__longjmp (__jmp_buf __env, int __val)
__attribute__ ((__noreturn__));
/* Internal function to possibly save the current mask of blocked signals
diff --git a/sysdeps/powerpc/powerpc32/setjmp.S b/sysdeps/powerpc/powerpc32/setjmp.S
index ecc1482..ef3514a 100644
--- a/sysdeps/powerpc/powerpc32/setjmp.S
+++ b/sysdeps/powerpc/powerpc32/setjmp.S
@@ -21,7 +21,7 @@
#include <libc-symbols.h>
#if defined NOT_IN_libc
-/* Build a none versioned object for rtld-*. */
+/* Build a non-versioned object for rtld-*. */
# include "setjmp-common.S"
#else /* !NOT_IN_libc */
@@ -35,6 +35,7 @@ default_symbol_version (__vmx__sigsetjmp,__sigsetjmp,GLIBC_2.3.4)
# define __NO_VMX__
# undef __sigsetjmp
# undef __sigjmp_save
+# undef JB_SIZE
symbol_version (__novmx__sigsetjmp,__sigsetjmp,GLIBC_2.0)
# define __sigsetjmp __novmx__sigsetjmp
# define __sigjmp_save __novmx__sigjmp_save
diff --git a/sysdeps/powerpc/powerpc64/setjmp.S b/sysdeps/powerpc/powerpc64/setjmp.S
index 7765383..acbf372 100644
--- a/sysdeps/powerpc/powerpc64/setjmp.S
+++ b/sysdeps/powerpc/powerpc64/setjmp.S
@@ -22,7 +22,7 @@
#include <shlib-compat.h>
#if defined NOT_IN_libc
-/* Build a none versioned object for rtld-*. */
+/* Build a non-versioned object for rtld-*. */
# include "setjmp-common.S"
#else /* !NOT_IN_libc */
@@ -35,6 +35,7 @@ default_symbol_version (__vmx__sigsetjmp,__sigsetjmp,GLIBC_2.3.4)
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)
# undef __sigsetjmp
# undef __sigjmp_save
+# undef JB_SIZE
# define __NO_VMX__
symbol_version (__novmx__sigsetjmp,__sigsetjmp,GLIBC_2.3)
# define __sigsetjmp __novmx__sigsetjmp