Ping! thanks -- PMM
On 10 May 2014 12:25, Peter Maydell <peter.mayd...@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.mayd...@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 > >
