* uname.cc (uname): Disable use of GetNativeSystemInfo.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3ef22c9..d5711b3 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-03  Corinna Vinschen  <corinna@vinschen.de>
+
+       * uname.cc (uname): Disable use of GetNativeSystemInfo.
+
 2005-10-01  Christopher Faylor  <cgf@timesys.com>
 
        * dcrt0.cc (get_exit_lock): Use myself.lock rather than exit_lock.

diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
index 35cf758..fa89373 100644 (file)
--- a/winsup/cygwin/uname.cc
+++ b/winsup/cygwin/uname.cc
@@ -31,10 +31,16 @@ uname (struct utsname *name)
   memset (name, 0, sizeof (*name));
   __small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ());
 
+#if 0
+  /* Recognition of the real 64 bit CPU inside of a WOW64 system, irritates
+     build systems which think the native system is a 64 bit system.  Since
+     we're actually running in a 32 bit environment, it looks more correct
+     just to use the CPU info given by WOW64. */
   BOOL is_64bit_machine = FALSE;
   if (IsWow64Process (hMainProc, &is_64bit_machine) && is_64bit_machine)
     GetNativeSystemInfo (&sysinfo);
   else
+#endif
     GetSystemInfo (&sysinfo);
 
   /* Computer name */