Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging

[qemu.git] / linux-user / uname.c

diff --git a/linux-user/uname.c b/linux-user/uname.c
index f5d4c66f59fbdefe944745b1022312578b93a5fe..313b79dbad477a0f1e39595140f624b126c63323 100644 (file)
--- a/linux-user/uname.c
+++ b/linux-user/uname.c
@@ -17,7 +17,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 

-#include <stdio.h>
+#include "qemu/osdep.h"

 
 #include "qemu.h"
 //#include "qemu-common.h"
 
 #include "qemu.h"
 //#include "qemu-common.h"


@@ -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;
     /* 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);
     /* 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);