From: Siddhesh Poyarekar Date: Sat, 8 Dec 2012 07:33:24 +0000 (+0530) Subject: Fix some build warnings on s390x X-Git-Tag: upstream/2.30~9769 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56e7d3ad5c2f369349bf7def0d8875a50e2d275b;p=external%2Fglibc.git Fix some build warnings on s390x --- diff --git a/ChangeLog b/ChangeLog index 4ef5042..576300f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-12-08 Siddhesh Poyarekar + + * sysdeps/s390/jmpbuf-unwind.h (_jmpbuf_sp): Declare SP as + void pointer and cast to uintptr_t. + * sysdeps/s390/s390-64/memcmp.S: Pick sysdep.h from include + path. + * sysdeps/s390/s390-64/memcpy.S: Likewise. + * sysdeps/s390/s390-64/memset.S: Likewise. + 2012-12-08 Benno Schulenberg [BZ #14833] diff --git a/nptl/ChangeLog b/nptl/ChangeLog index e8c1ddf..b950687 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2012-12-08 Siddhesh Poyarekar + + * sysdeps/unix/sysv/linux/s390/jmp-unwind.c (_longjmp_unwind): + Declare LOCAL_VAR as char. + 2012-12-04 Joseph Myers * sysdeps/unix/sysv/linux/powerpc/sem_post.c (__old_sem_post): diff --git a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c index 3f88539..bb2dfc0 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c @@ -1,5 +1,5 @@ /* Clean up stack frames unwound by longjmp. Linux/s390 version. - Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2003-2012 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 @@ -27,7 +27,7 @@ extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); void _longjmp_unwind (jmp_buf env, int val) { - unsigned char local_var; + char local_var; #ifdef SHARED if (__libc_pthread_functions_init) diff --git a/sysdeps/s390/jmpbuf-unwind.h b/sysdeps/s390/jmpbuf-unwind.h index 8ae35c1..7da3539 100644 --- a/sysdeps/s390/jmpbuf-unwind.h +++ b/sysdeps/s390/jmpbuf-unwind.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2003-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek , 2003. @@ -40,11 +40,11 @@ static inline uintptr_t __attribute__ ((unused)) _jmpbuf_sp (__jmp_buf regs) { - uintptr_t sp = regs[0].__gregs[__JB_GPR15]; + void *sp = (void *) (uintptr_t) regs[0].__gregs[__JB_GPR15]; #ifdef PTR_DEMANGLE PTR_DEMANGLE (sp); #endif - return sp; + return (uintptr_t) sp; } #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ diff --git a/sysdeps/s390/s390-64/memcmp.S b/sysdeps/s390/s390-64/memcmp.S index e0b62e3..1b43440 100644 --- a/sysdeps/s390/s390-64/memcmp.S +++ b/sysdeps/s390/s390-64/memcmp.S @@ -17,7 +17,7 @@ . */ -#include "sysdep.h" +#include #include "asm-syntax.h" /* INPUT PARAMETERS diff --git a/sysdeps/s390/s390-64/memcpy.S b/sysdeps/s390/s390-64/memcpy.S index 1e5f050..bae8836 100644 --- a/sysdeps/s390/s390-64/memcpy.S +++ b/sysdeps/s390/s390-64/memcpy.S @@ -17,7 +17,7 @@ . */ -#include "sysdep.h" +#include #include "asm-syntax.h" /* INPUT PARAMETERS diff --git a/sysdeps/s390/s390-64/memset.S b/sysdeps/s390/s390-64/memset.S index 6b3007b..4edfb4e 100644 --- a/sysdeps/s390/s390-64/memset.S +++ b/sysdeps/s390/s390-64/memset.S @@ -1,5 +1,5 @@ /* Set a block of memory to some byte value. 64 bit S/390 version. - Copyright (C) 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 2001-2012 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -18,7 +18,7 @@ . */ -#include "sysdep.h" +#include #include "asm-syntax.h" /* INPUT PARAMETERS