This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Fix ppc{,64} warnings


Hi!

Untested, though hopefully correct, fix for:
../sysdeps/powerpc/longjmp.c:28: warning: empty declaration
../sysdeps/powerpc/longjmp.c:30: warning: empty declaration
In file included from ../sysdeps/powerpc/powerpc32/fpu/setjmp-common.S:24,
                 from ../sysdeps/powerpc/powerpc32/fpu/setjmp.S:42:
../sysdeps/powerpc/novmxsetjmp.h:45:1: warning: "JB_SIZE" redefined
In file included from ../sysdeps/powerpc/powerpc32/fpu/setjmp-common.S:26,
                 from ../sysdeps/powerpc/powerpc32/fpu/setjmp.S:33:
../sysdeps/powerpc/bits/setjmp.h:51:1: warning: this is the location of the previous definition
../sysdeps/powerpc/longjmp.c:28: warning: empty declaration
../sysdeps/powerpc/longjmp.c:30: warning: empty declaration
In file included from ../sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S:24,
                 from ../sysdeps/powerpc/powerpc32/fpu/__longjmp.S:39:
../sysdeps/powerpc/novmxsetjmp.h:45:1: warning: "JB_SIZE" redefined
In file included from ../sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S:26,
                 from ../sysdeps/powerpc/powerpc32/fpu/__longjmp.S:32:
../sysdeps/powerpc/bits/setjmp.h:51:1: warning: this is the location of the previous definition
../sysdeps/powerpc/novmx-longjmp.c: In function `__novmx__libc_siglongjmp':
../sysdeps/powerpc/novmx-longjmp.c:46: warning: passing arg 1 of `__novmx__longjmp' from incompatible pointer type
../sysdeps/powerpc/longjmp.c:28: warning: empty declaration
../sysdeps/powerpc/longjmp.c:30: warning: empty declaration
(and the similar warnings on ppc64).

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.

--- libc/sysdeps/powerpc/powerpc64/__longjmp.S.jj	2004-02-19 17:50:45.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc64/__longjmp.S	2004-03-11 21:53:49.318671378 +0100
@@ -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 "__longjmp-common.S"
 
 #else /* !NOT_IN_libc */
@@ -34,6 +34,7 @@ default_symbol_version (__vmx__longjmp,_
 # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)
 #  define __NO_VMX__
 #  undef __longjmp
+#  undef JB_SIZE
 symbol_version(__novmx__longjmp,__longjmp,GLIBC_2.3)
 #  define __longjmp  __novmx__longjmp
 #  include "__longjmp-common.S"
--- libc/sysdeps/powerpc/powerpc64/setjmp.S.jj	2004-02-19 17:50:45.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc64/setjmp.S	2004-03-11 21:52:55.470348673 +0100
@@ -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
 # 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
--- libc/sysdeps/powerpc/powerpc32/__longjmp.S.jj	2004-02-19 17:50:45.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc32/__longjmp.S	2004-03-11 21:55:08.258484900 +0100
@@ -21,7 +21,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 "__longjmp-common.S"
 
 #else /* !NOT_IN_libc */
@@ -32,6 +32,7 @@ default_symbol_version (__vmx__longjmp,_
 
 # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
 #  define __NO_VMX__
+#  undef JB_SIZE
 symbol_version (__novmx__longjmp,__longjmp,GLIBC_2.0);
 #  undef __longjmp
 #  define __longjmp  __novmx__longjmp
--- libc/sysdeps/powerpc/powerpc32/setjmp.S.jj	2004-02-19 17:50:45.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc32/setjmp.S	2004-03-11 21:55:37.584214730 +0100
@@ -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
 #  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
--- libc/sysdeps/powerpc/novmxsetjmp.h.jj	2004-02-14 04:27:12.000000000 +0100
+++ libc/sysdeps/powerpc/novmxsetjmp.h	2004-03-11 22:05:40.019953376 +0100
@@ -108,7 +108,7 @@ extern void __novmxsiglongjmp (__novmx__
      __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
--- libc/sysdeps/powerpc/longjmp.c.jj	2004-02-14 04:26:07.000000000 +0100
+++ libc/sysdeps/powerpc/longjmp.c	2004-03-11 21:47:42.509597232 +0100
@@ -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)
 

	Jakub


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]