1 files changed, 8 insertions, 1 deletions

diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c
index 3f5b1514e8a..56b8a50e8bc 100644
--- a/arch/um/os-Linux/util.c
+++ b/arch/um/os-Linux/util.c
@@ -80,11 +80,18 @@ void setup_machinename(char *machine_out)
         struct utsname host;
 
         uname(&host);
-#if defined(UML_CONFIG_UML_X86) && !defined(UML_CONFIG_64BIT)
+#ifdef UML_CONFIG_UML_X86
+# ifndef UML_CONFIG_64BIT
         if (!strcmp(host.machine, "x86_64")) {
                 strcpy(machine_out, "i686");
                 return;
         }
+# else
+        if (!strcmp(host.machine, "i686")) {
+                strcpy(machine_out, "x86_64");
+                return;
+        }
+# endif
 #endif
         strcpy(machine_out, host.machine);
 }