darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PR gdb/13218

Browse source 
* arm-linux-nat.c (os_version, os_major, os_minor, os_release):
	Remove unused variables.
	(get_linux_version): Remove function.
	(_initialize_arm_linux_nat): Do not call it.
This commit is contained in:
Ulrich Weigand 2011-10-10 18:47:49 +00:00
parent 53bbcc1bb8
commit 623bd5b7fd
2 changed files with 8 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2011-10-10 Ulrich Weigand <ulrich.weigand@linaro.org>
PR gdb/13218
* arm-linux-nat.c (os_version, os_major, os_minor, os_release):
Remove unused variables.
(get_linux_version): Remove function.
(_initialize_arm_linux_nat): Do not call it.
2011-10-10 Pedro Alves <pedro@codesourcery.com>
* linux-nat.c (linux_handle_extended_wait): Don't resume the new

43
gdb/arm-linux-nat.c
View file

@ -72,22 +72,6 @@ static int arm_linux_vfp_register_count;
extern int arm_apcs_32;
/* The following variables are used to determine the version of the
underlying GNU/Linux operating system. Examples:
GNU/Linux 2.0.35 GNU/Linux 2.2.12
os_version = 0x00020023 os_version = 0x0002020c
os_major = 2 os_major = 2
os_minor = 0 os_minor = 2
os_release = 35 os_release = 12
Note: os_version = (os_major << 16) | (os_minor << 8) | os_release
These are initialized using get_linux_version() from
_initialize_arm_linux_nat(). */
static unsigned int os_version, os_major, os_minor, os_release;
/* On GNU/Linux, threads are implemented as pseudo-processes, in which
case we may be tracing more than one process at a time. In that
case, inferior_ptid will contain the main process ID and the
@ -644,31 +628,6 @@ ps_get_thread_area (const struct ps_prochandle *ph,
return PS_OK;
}
static unsigned int
get_linux_version (unsigned int *vmajor,
unsigned int *vminor,
unsigned int *vrelease)
{
struct utsname info;
char *pmajor, *pminor, *prelease, *tail;
if (-1 == uname (&info))
{
warning (_("Unable to determine GNU/Linux version."));
return -1;
}
pmajor = strtok (info.release, ".");
pminor = strtok (NULL, ".");
prelease = strtok (NULL, ".");
*vmajor = (unsigned int) strtoul (pmajor, &tail, 0);
*vminor = (unsigned int) strtoul (pminor, &tail, 0);
*vrelease = (unsigned int) strtoul (prelease, &tail, 0);
return ((*vmajor << 16) | (*vminor << 8) | *vrelease);
}
static const struct target_desc *
arm_linux_read_description (struct target_ops *ops)
{
@ -1287,8 +1246,6 @@ _initialize_arm_linux_nat (void)
{
struct target_ops *t;
os_version = get_linux_version (&os_major, &os_minor, &os_release);
/* Fill in the generic GNU/Linux methods. */
t = linux_target ();