--- a/jdk/src/java.base/unix/native/libjli/ergo_i586.c	Thu Nov 24 12:04:44 2016 +0530
+++ b/jdk/src/java.base/unix/native/libjli/ergo_i586.c	Mon Dec 05 17:56:20 2016 +0100
@@ -99,7 +99,7 @@
       result = JNI_TRUE;
     }
   }
-  JLI_TraceLauncher("solaris_" LIBARCHNAME "_ServerClassMachine: %s\n",
+  JLI_TraceLauncher("solaris_ServerClassMachine: %s\n",
            (result == JNI_TRUE ? "true" : "false"));
   return result;
 }
@@ -193,7 +193,7 @@
       result = JNI_TRUE;
     }
   }
-  JLI_TraceLauncher("linux_" LIBARCHNAME "_ServerClassMachine: %s\n",
+  JLI_TraceLauncher("linux_ServerClassMachine: %s\n",
            (result == JNI_TRUE ? "true" : "false"));
   return result;
 }