diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-02-23 10:51:59 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-02-23 10:51:59 +0000 |
| commit | aaee2ffaed818ccaf248b4097a3b7c7bfa4ea82a (patch) | |
| tree | de45285730967b7e6bad23073b76ae2506c3e453 /winsup/cygwin/uname.cc | |
| parent | 0ed760d75e34775d5de25ac52cbcc5b5dd18ed15 (diff) | |
| download | cygnal-aaee2ffaed818ccaf248b4097a3b7c7bfa4ea82a.tar.gz cygnal-aaee2ffaed818ccaf248b4097a3b7c7bfa4ea82a.tar.bz2 cygnal-aaee2ffaed818ccaf248b4097a3b7c7bfa4ea82a.zip | |
* exceptions.cc (dummy_ctrl_c_handler): Remove.
(init_console_handler): Drop has_null_console_handler_routine checks.
* fhandler_raw.cc (fhandler_dev_raw::open): Drop has_raw_devices check.
* fhandler_serial.cc (fhandler_serial::open): Drop
.supports_reading_modem_output_lines check.
* miscfuncs.cc (low_priority_sleep): Drop has_switch_to_thread check.
* shared.cc (open_shared): Drop needs_memory_protection checks.
* spawn.cc (spawn_guts): Drop start_proc_suspended check.
* uname.cc (uname): Drop has_valid_processorlevel check.
* wincap.cc: Remove has_raw_devices, has_valid_processorlevel,
supports_reading_modem_output_lines, needs_memory_protection,
has_switch_to_thread, start_proc_suspended and
has_null_console_handler_routine throughout.
* wincap.h: Ditto.
Diffstat (limited to 'winsup/cygwin/uname.cc')
| -rw-r--r-- | winsup/cygwin/uname.cc | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc index 3797b140d..abd77cb19 100644 --- a/winsup/cygwin/uname.cc +++ b/winsup/cygwin/uname.cc @@ -1,6 +1,7 @@ /* uname.cc - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc. + Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006, 2007 Red Hat, Inc. Written by Steve Chamberlain of Cygnus Support, sac@cygnus.com Rewritten by Geoffrey Noer of Cygnus Solutions, noer@cygnus.com @@ -72,23 +73,12 @@ uname (struct utsname *name) { case PROCESSOR_ARCHITECTURE_INTEL: unsigned int ptype; - if (wincap.has_valid_processorlevel ()) - { - if (sysinfo.wProcessorLevel < 3) /* Shouldn't happen. */ - ptype = 3; - else if (sysinfo.wProcessorLevel > 9) /* P4 */ - ptype = 6; - else - ptype = sysinfo.wProcessorLevel; - } + if (sysinfo.wProcessorLevel < 3) /* Shouldn't happen. */ + ptype = 3; + else if (sysinfo.wProcessorLevel > 9) /* P4 */ + ptype = 6; else - { - if (sysinfo.dwProcessorType == PROCESSOR_INTEL_386 || - sysinfo.dwProcessorType == PROCESSOR_INTEL_486) - ptype = sysinfo.dwProcessorType / 100; - else - ptype = PROCESSOR_INTEL_PENTIUM / 100; - } + ptype = sysinfo.wProcessorLevel; __small_sprintf (name->machine, "i%d86", ptype); break; case PROCESSOR_ARCHITECTURE_IA64: |