| Message ID | 1399721153-22248-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
Ping! thanks -- PMM On 10 May 2014 12:25, Peter Maydell <peter.maydell@linaro.org> wrote: > We were returning the incorrect uname string (with a hyphen, not > an underscore) for x86_64. Fix this by removing the x86_64 special > case, since the default "just use UNAME_MACHINE" behaviour suffices. > This leaves cpu_to_uname_machine() special cases for only those > architectures which need to vary the string based on runtime CPU > features. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > linux-user/uname.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/linux-user/uname.c b/linux-user/uname.c > index f5d4c66..1e6560d 100644 > --- a/linux-user/uname.c > +++ b/linux-user/uname.c > @@ -52,9 +52,7 @@ const char *cpu_to_uname_machine(void *cpu_env) > /* earliest emulated CPU is ARMv5TE; qemu can emulate the 1026, but not its > * Jazelle support */ > return "armv5te" utsname_suffix; > -#elif defined(TARGET_X86_64) > - return "x86-64"; > -#elif defined(TARGET_I386) > +#elif defined(TARGET_I386) && !defined(TARGET_X86_64) > /* see arch/x86/kernel/cpu/bugs.c: check_bugs(), 386, 486, 586, 686 */ > CPUState *cpu = ENV_GET_CPU((CPUX86State *)cpu_env); > int family = object_property_get_int(OBJECT(cpu), "family", NULL); > -- > 1.9.2 > >
Hi, On Tue, Jun 03, 2014 at 03:07:59PM +0100, Peter Maydell wrote: > Ping! Looks good, I'll collect this and other linux-user patches and submit linux-user update by tomorrow. Riku > thanks > -- PMM > > On 10 May 2014 12:25, Peter Maydell <peter.maydell@linaro.org> wrote: > > We were returning the incorrect uname string (with a hyphen, not > > an underscore) for x86_64. Fix this by removing the x86_64 special > > case, since the default "just use UNAME_MACHINE" behaviour suffices. > > This leaves cpu_to_uname_machine() special cases for only those > > architectures which need to vary the string based on runtime CPU > > features. > > > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > --- > > linux-user/uname.c | 4 +--- > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/linux-user/uname.c b/linux-user/uname.c > > index f5d4c66..1e6560d 100644 > > --- a/linux-user/uname.c > > +++ b/linux-user/uname.c > > @@ -52,9 +52,7 @@ const char *cpu_to_uname_machine(void *cpu_env) > > /* earliest emulated CPU is ARMv5TE; qemu can emulate the 1026, but not its > > * Jazelle support */ > > return "armv5te" utsname_suffix; > > -#elif defined(TARGET_X86_64) > > - return "x86-64"; > > -#elif defined(TARGET_I386) > > +#elif defined(TARGET_I386) && !defined(TARGET_X86_64) > > /* see arch/x86/kernel/cpu/bugs.c: check_bugs(), 386, 486, 586, 686 */ > > CPUState *cpu = ENV_GET_CPU((CPUX86State *)cpu_env); > > int family = object_property_get_int(OBJECT(cpu), "family", NULL); > > -- > > 1.9.2 > > > >
On 5 June 2014 14:11, Riku Voipio <riku.voipio@iki.fi> wrote: > Hi, > > On Tue, Jun 03, 2014 at 03:07:59PM +0100, Peter Maydell wrote: >> Ping! > > Looks good, I'll collect this and other linux-user patches and submit linux-user update > by tomorrow. Does that include the set you did fixing gcc 4.9 compiles? I forget whether that had issues that needed a v2 or not. thanks -- PMM
On Thu, Jun 05, 2014 at 02:21:42PM +0100, Peter Maydell wrote: > On 5 June 2014 14:11, Riku Voipio <riku.voipio@iki.fi> wrote: > > Hi, > > > > On Tue, Jun 03, 2014 at 03:07:59PM +0100, Peter Maydell wrote: > >> Ping! > > > > Looks good, I'll collect this and other linux-user patches and submit linux-user update > > by tomorrow. > Does that include the set you did fixing gcc 4.9 compiles? > I forget whether that had issues that needed a v2 or not. The only issue is that nobody reviewed it. I've updated the patchset a bit with better description and replaced ifdeffing of restore_fpu_state with removin the lines. I'll send it on the list again so people have another chance to look at the patches. Riku
diff --git a/linux-user/uname.c b/linux-user/uname.c index f5d4c66..1e6560d 100644 --- a/linux-user/uname.c +++ b/linux-user/uname.c @@ -52,9 +52,7 @@ const char *cpu_to_uname_machine(void *cpu_env) /* earliest emulated CPU is ARMv5TE; qemu can emulate the 1026, but not its * Jazelle support */ return "armv5te" utsname_suffix; -#elif defined(TARGET_X86_64) - return "x86-64"; -#elif defined(TARGET_I386) +#elif defined(TARGET_I386) && !defined(TARGET_X86_64) /* see arch/x86/kernel/cpu/bugs.c: check_bugs(), 386, 486, 586, 686 */ CPUState *cpu = ENV_GET_CPU((CPUX86State *)cpu_env); int family = object_property_get_int(OBJECT(cpu), "family", NULL);
We were returning the incorrect uname string (with a hyphen, not an underscore) for x86_64. Fix this by removing the x86_64 special case, since the default "just use UNAME_MACHINE" behaviour suffices. This leaves cpu_to_uname_machine() special cases for only those architectures which need to vary the string based on runtime CPU features. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- linux-user/uname.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)