Re: [Qemu-devel] [Qemu-ppc] [PULL 00/52] ppc patch queue 2014-09-04

[Tom Musta <tommusta@gmail.com>]

On 9/4/2014 2:13 PM, Alexander Graf wrote:
> 
> 
>> Am 04.09.2014 um 20:38 schrieb Peter Maydell <peter.maydell@linaro.org>:
>>
>>> On 4 September 2014 18:19, Alexander Graf <agraf@suse.de> wrote:
>>> Hi Peter,
>>>
>>> This is my current patch queue for ppc.  Please pull.
>>
>> Hi. I'm afraid this doesn't build (x86, 64bit, gcc
>> 4.8.2, non-debug build):
>>
>>  CC    ppc64abi32-linux-user/linux-user/signal.o
>> /home/petmay01/linaro/qemu-for-merges/linux-user/signal.c: In function
>> ‘setup_frame’:
>> /home/petmay01/linaro/qemu-for-merges/linux-user/signal.c:4698:5:
>> error: right shift count >= width of type [-Werror]
>>     __put_user(set->sig[0] >> 32, &sc->_unused[3]);
>>     ^
>> cc1: all warnings being treated as errors
> 
> Ouch. I guess we're missing ppc64abi32 in travis then - it never complained here ;).
> 
> Will fix in a few hours and resend.
> 
> 
> Alex
> 
>>
>> thanks
>> -- PMM
> 

I am thinking that the way to fix this is by amending patch 5/52 () with this change

diff --git a/linux-user/signal.c b/linux-user/signal.c
index a227213..edecd76 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -4682,7 +4682,7 @@ static void setup_frame(int sig, struct target_sigaction *ka,

     __put_user(ka->_sa_handler, &sc->handler);
     __put_user(set->sig[0], &sc->oldmask);
-#if defined(TARGET_PPC64)
+#if TARGET_ABI_BITS == 64
     __put_user(set->sig[0] >> 32, &sc->_unused[3]);
 #else
     __put_user(set->sig[1], &sc->_unused[3]);