From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8929 invoked by alias); 4 Aug 2010 14:36:00 -0000 Received: (qmail 8914 invoked by uid 22791); 4 Aug 2010 14:35:57 -0000 X-SWARE-Spam-Status: No, hits=-0.6 required=5.0 tests=AWL,BAYES_50,TW_XS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 04 Aug 2010 14:35:49 +0000 Received: (qmail 10999 invoked from network); 4 Aug 2010 14:35:48 -0000 Received: from unknown (HELO orlando.localnet) (pedro@127.0.0.2) by mail.codesourcery.com with ESMTPA; 4 Aug 2010 14:35:48 -0000 From: Pedro Alves To: gdb@sourceware.org Subject: Re: pthread_t ids of threads not showed by "thread info" Date: Wed, 04 Aug 2010 14:36:00 -0000 User-Agent: KMail/1.13.2 (Linux/2.6.31-11-rt; KDE/4.4.2; x86_64; ; ) Cc: Mark Kettenis , stefano.sabatini-lala@poste.it References: <20100422151855.GA3128@geppetto> <201004231536.o3NFa1Kn029584@glazunov.sibelius.xs4all.nl> <201004231651.31431.pedro@codesourcery.com> In-Reply-To: <201004231651.31431.pedro@codesourcery.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201008041535.44552.pedro@codesourcery.com> X-IsSubscribed: yes Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2010-08/txt/msg00025.txt.bz2 [Mark, patch below] On Friday 23 April 2010 16:51:31, Pedro Alves wrote: > On Friday 23 April 2010 16:36:01, Mark Kettenis wrote: > > > From: Pedro Alves > > > > > The interpretation of the > > > > pid read from the core file really is OS-specific. The default > > > > core_pid_to_str should really be the lowest common denominator, i.e, > > > > normal_pid_to_str(). That's really the only thing that makes sense > > > > for non-threaded code on a UNIX-like system. > > > > > > Yeah, probably. What are the targets we support you're thinking > > > where "process" would make more sense and be less confusing > > > than "LWP"? Pedantic-ness issues aside, seeing multiple > > > "processes" in the list when all the processes share a single > > > address space looks a bit strange to me. > > > > I was thinking of *any* target running a UNIX-like OS. For for the > > (typical) user debugging a non-threaded program on a UNIX-like OS, > > seeing "Thread ..." or "LWP ..." is confusing. Especially the term > > "LWP" will be pretty cryptic to many people not familliar with > > implementation details of the Solaris/SVR4.2 MP/NetBSD threads > > implementations. > > > > One can even argue that it's the wrong thing to use on Linux. I don't > > think the Linux kernel has the concept of an LWP. A more appropriate > > term on Linux would be TID, at least that is what the gettid() man > > page uses and what's used in the comments in the kernel sources. > > Maybe. That's a fair point. I've no sensibility whether TID would > be more or less confusing for linux users. > > > > > The threads stratum then > > > > can override this for threaded code. > > > > > > > > If like on Linux, the threading stuff is messed up for core files, and > > > > not easily fixable, it is probably more helpful to print LWP's like > > > > you suggest. > > > > > > It's not about that, that's a different issue. In linux, assume > > > we're talking about the core of a program that didn't use any > > > pthreads facilities (used raw `clone'), and you still have > > > multiple processes listed in the core. > > > > Right. It would be nice if that produced meaningful output as well. > > > > > > But in my opinion that really should be done by > > > > overriding the default using set_gdbarch_core_pid_to_str(). > > > > > > That works, of course. I'm just thinking of the practical > > > aspect. If we have many targets that want "LWP", and one > > > that wants "process", is it worth the hassle? > > > > I think decoupling things will help us here in the long run. > > Completely decoupling would mean no default at all ;-) > > I'll eventually come up with a patch, though not this > week, probably. Here's a patch. Keeping "LWP" for linux, as that's what linux-nat.c prints (probably since ever), so that we're consistent. I've added linux_init_abi, for common GNU/Linux osabi stuff, and, added a cygwin callback so that it keeps printing "Thread". WDYT? -- Pedro Alves 2010-08-04 Pedro Alves * corelow.c (core_pid_to_str): Default to using normal_pid_to_str instead of printing "Thread" here. * linux-tdep.c: Include inferior.h. (linux_core_pid_to_str): New. (linux_init_abi): New. * linux-tdep.h (linux_init_abi): Declare. * alpha-linux-tdep.c: Include linux-tdep.h. (alpha_linux_init_abi): Call linux_init_abi. * amd64-linux-tdep.c (amd64_linux_init_abi): Call linux_init_abi. * arm-linux-tdep.c (arm_linux_init_abi): Call linux_init_abi. * frv-linux-tdep.c: Include linux-tdep.h (frv_linux_init_abi): Call linux_init_abi. * hppa-linux-tdep.c: Include linux-tdep.h (hppa_linux_init_abi): Call linux_init_abi. * i386-linux-tdep.c (i386_linux_init_abi): Call linux_init_abi. * ia64-linux-tdep.c: Include linux-tdep.h. (ia64_linux_init_abi): Call linux_init_abi. * m32r-linux-tdep.c: Include linux-tdep.h. (m32r_linux_init_abi): Call linux_init_abi. * m68klinux-tdep.c: Include linux-tdep.h. (m68k_linux_init_abi): Call linux_init_abi. * microblaze-linux-tdep.c: Include linux-tdep.h. (microblaze_linux_init_abi): Call linux_init_abi. * mips-linux-tdep.c: Include linux-tdep.h. (mips_linux_init_abi): Call linux_init_abi. * mn10300-linux-tdep.c: Include linux-tdep.h. (am33_linux_init_osabi): Call linux_init_abi. Rename the 'gdbinfo' parameter to 'info'. * ppc-linux-tdep.c: Include linux-tdep.h. (ppc_linux_init_abi): Call linux_init_abi. * sh-linux-tdep.c: Include linux-tdep.h. (sh_linux_init_abi): Call linux_init_abi. * sparc-linux-tdep.c: Include linux-tdep.h. (sparc32_linux_init_abi): Call linux_init_abi. * sparc64-linux-tdep.c: Include linux-tdep.h. (sparc64_linux_init_abi): Call linux_init_abi. * xtensa-linux-tdep.c: Include linux-tdep.h. (xtensa_linux_init_abi): Call linux_init_abi. * i386-cygwin-tdep.c (i386_windows_core_pid_to_str): New. (i386_cygwin_init_abi): Install it as gdbarch_core_pid_to_str callback. --- gdb/alpha-linux-tdep.c | 4 +++- gdb/amd64-linux-tdep.c | 2 ++ gdb/arm-linux-tdep.c | 2 ++ gdb/corelow.c | 28 ++++++++++++++++++---------- gdb/frv-linux-tdep.c | 4 ++++ gdb/hppa-linux-tdep.c | 4 +++- gdb/i386-cygwin-tdep.c | 18 ++++++++++++++++++ gdb/i386-linux-tdep.c | 2 ++ gdb/ia64-linux-tdep.c | 3 +++ gdb/linux-tdep.c | 26 ++++++++++++++++++++++++++ gdb/linux-tdep.h | 2 ++ gdb/m32r-linux-tdep.c | 4 ++++ gdb/m68klinux-tdep.c | 3 +++ gdb/microblaze-linux-tdep.c | 4 +++- gdb/mips-linux-tdep.c | 3 +++ gdb/mn10300-linux-tdep.c | 5 ++++- gdb/ppc-linux-tdep.c | 3 +++ gdb/sh-linux-tdep.c | 3 +++ gdb/sparc-linux-tdep.c | 3 +++ gdb/sparc64-linux-tdep.c | 3 +++ gdb/xtensa-linux-tdep.c | 4 +++- 21 files changed, 115 insertions(+), 15 deletions(-) Index: src/gdb/corelow.c =================================================================== --- src.orig/gdb/corelow.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/corelow.c 2010-08-04 15:18:11.000000000 +0100 @@ -853,21 +853,29 @@ static char * core_pid_to_str (struct target_ops *ops, ptid_t ptid) { static char buf[64]; + int pid; + /* The preferred way is to have a gdbarch/OS specific + implementation. */ if (core_gdbarch && gdbarch_core_pid_to_str_p (core_gdbarch)) - { - char *ret = gdbarch_core_pid_to_str (core_gdbarch, ptid); + return gdbarch_core_pid_to_str (core_gdbarch, ptid); - if (ret != NULL) - return ret; - } - - if (ptid_get_lwp (ptid) == 0) - xsnprintf (buf, sizeof buf, "
"); - else - xsnprintf (buf, sizeof buf, "Thread %ld", ptid_get_lwp (ptid)); + /* Otherwise, if we don't have one, we'll just fallback to + "process", with normal_pid_to_str. */ + /* Try the LWPID field first. */ + pid = ptid_get_lwp (ptid); + if (pid != 0) + return normal_pid_to_str (pid_to_ptid (pid)); + + /* Otherwise, this isn't a "threaded" core -- use the PID field, but + only if it isn't a fake PID. */ + if (!core_has_fake_pid) + return normal_pid_to_str (ptid); + + /* No luck. We simply don't have a valid PID to print. */ + xsnprintf (buf, sizeof buf, "
"); return buf; } Index: src/gdb/linux-tdep.c =================================================================== --- src.orig/gdb/linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/linux-tdep.c 2010-08-04 15:27:56.000000000 +0100 @@ -23,6 +23,7 @@ #include "auxv.h" #include "target.h" #include "elf/common.h" +#include "inferior.h" /* This function is suitable for architectures that don't extend/override the standard siginfo structure. */ @@ -152,3 +153,28 @@ linux_has_shared_address_space (void) return target_is_uclinux; } + +/* This is how we want PTIDs from core files to be printed. */ + +static char * +linux_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid) +{ + static char buf[80]; + + if (ptid_get_lwp (ptid) != 0) + { + snprintf (buf, sizeof (buf), "LWP %ld", ptid_get_lwp (ptid)); + return buf; + } + + return normal_pid_to_str (ptid); +} + +/* To be called from the various GDB_OSABI_LINUX handlers for the + various GNU/Linux architectures and machine types. */ + +void +linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + set_gdbarch_core_pid_to_str (gdbarch, linux_core_pid_to_str); +} Index: src/gdb/linux-tdep.h =================================================================== --- src.orig/gdb/linux-tdep.h 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/linux-tdep.h 2010-08-03 18:42:20.000000000 +0100 @@ -22,4 +22,6 @@ struct type *linux_get_siginfo_type (struct gdbarch *); +extern void linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch); + #endif /* linux-tdep.h */ Index: src/gdb/alpha-linux-tdep.c =================================================================== --- src.orig/gdb/alpha-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/alpha-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -26,7 +26,7 @@ #include "symtab.h" #include "regset.h" #include "regcache.h" - +#include "linux-tdep.h" #include "alpha-tdep.h" /* Under GNU/Linux, signal handler invocations can be identified by @@ -212,6 +212,8 @@ alpha_linux_init_abi (struct gdbarch_inf { struct gdbarch_tdep *tdep; + linux_init_abi (info, gdbarch); + /* Hook into the DWARF CFI frame unwinder. */ alpha_dwarf2_init_abi (info, gdbarch); Index: src/gdb/amd64-linux-tdep.c =================================================================== --- src.orig/gdb/amd64-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/amd64-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -1291,6 +1291,8 @@ amd64_linux_init_abi (struct gdbarch_inf gdb_assert (tdesc_data); + linux_init_abi (info, gdbarch); + tdep->gregset_reg_offset = amd64_linux_gregset_reg_offset; tdep->gregset_num_regs = ARRAY_SIZE (amd64_linux_gregset_reg_offset); tdep->sizeof_gregset = 27 * 8; Index: src/gdb/arm-linux-tdep.c =================================================================== --- src.orig/gdb/arm-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/arm-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -862,6 +862,8 @@ arm_linux_init_abi (struct gdbarch_info { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + linux_init_abi (info, gdbarch); + tdep->lowest_pc = 0x8000; if (info.byte_order == BFD_ENDIAN_BIG) { Index: src/gdb/frv-linux-tdep.c =================================================================== --- src.orig/gdb/frv-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/frv-linux-tdep.c 2010-08-03 18:44:42.000000000 +0100 @@ -32,6 +32,7 @@ #include "frame-unwind.h" #include "regset.h" #include "gdb_string.h" +#include "linux-tdep.h" /* Define the size (in bytes) of an FR-V instruction. */ static const int frv_instr_size = 4; @@ -490,8 +491,11 @@ frv_linux_regset_from_core_section (stru static void frv_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { + linux_init_abi (info, gdbarch); + /* Set the sigtramp frame sniffer. */ frame_unwind_append_unwinder (gdbarch, &frv_linux_sigtramp_frame_unwind); + set_gdbarch_regset_from_core_section (gdbarch, frv_linux_regset_from_core_section); } Index: src/gdb/hppa-linux-tdep.c =================================================================== --- src.orig/gdb/hppa-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/hppa-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -32,7 +32,7 @@ #include "regset.h" #include "regcache.h" #include "hppa-tdep.h" - +#include "linux-tdep.h" #include "elf/common.h" /* Map DWARF DBX register numbers to GDB register numbers. */ @@ -523,6 +523,8 @@ hppa_linux_init_abi (struct gdbarch_info { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + linux_init_abi (info, gdbarch); + /* GNU/Linux is always ELF. */ tdep->is_elf = 1; Index: src/gdb/i386-linux-tdep.c =================================================================== --- src.orig/gdb/i386-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/i386-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -654,6 +654,8 @@ i386_linux_init_abi (struct gdbarch_info gdb_assert (tdesc_data); + linux_init_abi (info, gdbarch); + /* GNU/Linux uses ELF. */ i386_elf_init_abi (info, gdbarch); Index: src/gdb/ia64-linux-tdep.c =================================================================== --- src.orig/gdb/ia64-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/ia64-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -26,6 +26,7 @@ #include "osabi.h" #include "solib-svr4.h" #include "symtab.h" +#include "linux-tdep.h" /* The sigtramp code is in a non-readable (executable-only) region of memory called the ``gate page''. The addresses in question @@ -122,6 +123,8 @@ ia64_linux_init_abi (struct gdbarch_info { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + linux_init_abi (info, gdbarch); + /* Set the method of obtaining the sigcontext addresses at which registers are saved. */ tdep->sigcontext_register_address = ia64_linux_sigcontext_register_address; Index: src/gdb/m32r-linux-tdep.c =================================================================== --- src.orig/gdb/m32r-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/m32r-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -37,6 +37,8 @@ #include "frame-unwind.h" #include "m32r-tdep.h" +#include "linux-tdep.h" + /* Recognizing signal handler frames. */ @@ -404,6 +406,8 @@ m32r_linux_init_abi (struct gdbarch_info { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + linux_init_abi (info, gdbarch); + /* Since EVB register is not available for native debug, we reduce the number of registers. */ set_gdbarch_num_regs (gdbarch, M32R_NUM_REGS - 1); Index: src/gdb/m68klinux-tdep.c =================================================================== --- src.orig/gdb/m68klinux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/m68klinux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -38,6 +38,7 @@ #include "auxv.h" #include "observer.h" #include "elf/common.h" +#include "linux-tdep.h" /* Offsets (in target ints) into jmp_buf. */ @@ -338,6 +339,8 @@ m68k_linux_init_abi (struct gdbarch_info { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + linux_init_abi (info, gdbarch); + tdep->jb_pc = M68K_LINUX_JB_PC; tdep->jb_elt_size = M68K_LINUX_JB_ELEMENT_SIZE; Index: src/gdb/microblaze-linux-tdep.c =================================================================== --- src.orig/gdb/microblaze-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/microblaze-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -35,7 +35,7 @@ #include "trad-frame.h" #include "frame-unwind.h" #include "tramp-frame.h" - +#include "linux-tdep.h" static int microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch, @@ -123,6 +123,8 @@ microblaze_linux_init_abi (struct gdbarc { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + linux_init_abi (info, gdbarch); + set_gdbarch_memory_remove_breakpoint (gdbarch, microblaze_linux_memory_remove_breakpoint); Index: src/gdb/mips-linux-tdep.c =================================================================== --- src.orig/gdb/mips-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/mips-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -38,6 +38,7 @@ #include "target-descriptions.h" #include "mips-linux-tdep.h" #include "glibc-tdep.h" +#include "linux-tdep.h" static struct target_so_ops mips_svr4_so_ops; @@ -1140,6 +1141,8 @@ mips_linux_init_abi (struct gdbarch_info enum mips_abi abi = mips_abi (gdbarch); struct tdesc_arch_data *tdesc_data = (void *) info.tdep_info; + linux_init_abi (info, gdbarch); + switch (abi) { case MIPS_ABI_O32: Index: src/gdb/mn10300-linux-tdep.c =================================================================== --- src.orig/gdb/mn10300-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/mn10300-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -32,6 +32,7 @@ #include "frame.h" #include "trad-frame.h" #include "tramp-frame.h" +#include "linux-tdep.h" #include @@ -709,8 +710,10 @@ am33_linux_sigframe_cache_init (const st Now's our chance to register our corefile handling. */ static void -am33_linux_init_osabi (struct gdbarch_info gdbinfo, struct gdbarch *gdbarch) +am33_linux_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch) { + linux_init_abi (info, gdbarch); + set_gdbarch_regset_from_core_section (gdbarch, am33_regset_from_core_section); set_solib_svr4_fetch_link_map_offsets Index: src/gdb/ppc-linux-tdep.c =================================================================== --- src.orig/gdb/ppc-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/ppc-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -48,6 +48,7 @@ #include "arch-utils.h" #include "spu-tdep.h" #include "xml-syscall.h" +#include "linux-tdep.h" #include "features/rs6000/powerpc-32l.c" #include "features/rs6000/powerpc-altivec32l.c" @@ -1486,6 +1487,8 @@ ppc_linux_init_abi (struct gdbarch_info struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct tdesc_arch_data *tdesc_data = (void *) info.tdep_info; + linux_init_abi (info, gdbarch); + /* PPC GNU/Linux uses either 64-bit or 128-bit long doubles; where 128-bit, they are IBM long double, not IEEE quad long double as in the System V ABI PowerPC Processor Supplement. We can safely Index: src/gdb/sh-linux-tdep.c =================================================================== --- src.orig/gdb/sh-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/sh-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -25,6 +25,7 @@ #include "glibc-tdep.h" #include "sh-tdep.h" +#include "linux-tdep.h" #define REGSx16(base) \ {(base), 0}, \ @@ -72,6 +73,8 @@ static const struct sh_corefile_regmap f static void sh_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { + linux_init_abi (info, gdbarch); + /* GNU/Linux uses SVR4-style shared libraries. */ set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); set_solib_svr4_fetch_link_map_offsets Index: src/gdb/sparc-linux-tdep.c =================================================================== --- src.orig/gdb/sparc-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/sparc-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -33,6 +33,7 @@ #include "trad-frame.h" #include "tramp-frame.h" #include "xml-syscall.h" +#include "linux-tdep.h" /* The syscall's XML filename for sparc 32-bit. */ #define XML_SYSCALL_FILENAME_SPARC32 "syscalls/sparc-linux.xml" @@ -273,6 +274,8 @@ sparc32_linux_init_abi (struct gdbarch_i { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + linux_init_abi (info, gdbarch); + tdep->gregset = regset_alloc (gdbarch, sparc32_linux_supply_core_gregset, sparc32_linux_collect_core_gregset); tdep->sizeof_gregset = 152; Index: src/gdb/sparc64-linux-tdep.c =================================================================== --- src.orig/gdb/sparc64-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/sparc64-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -32,6 +32,7 @@ #include "trad-frame.h" #include "tramp-frame.h" #include "xml-syscall.h" +#include "linux-tdep.h" /* The syscall's XML filename for sparc 64-bit. */ #define XML_SYSCALL_FILENAME_SPARC64 "syscalls/sparc64-linux.xml" @@ -237,6 +238,8 @@ sparc64_linux_init_abi (struct gdbarch_i { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + linux_init_abi (info, gdbarch); + tdep->gregset = regset_alloc (gdbarch, sparc64_linux_supply_core_gregset, sparc64_linux_collect_core_gregset); tdep->sizeof_gregset = 288; Index: src/gdb/xtensa-linux-tdep.c =================================================================== --- src.orig/gdb/xtensa-linux-tdep.c 2010-07-28 19:50:13.000000000 +0100 +++ src/gdb/xtensa-linux-tdep.c 2010-08-03 18:42:20.000000000 +0100 @@ -19,7 +19,7 @@ #include "defs.h" #include "osabi.h" - +#include "linux-tdep.h" #include "solib-svr4.h" #include "symtab.h" @@ -28,6 +28,8 @@ static void xtensa_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { + linux_init_abi (info, gdbarch); + set_solib_svr4_fetch_link_map_offsets (gdbarch, svr4_ilp32_fetch_link_map_offsets); } Index: src/gdb/i386-cygwin-tdep.c =================================================================== --- src.orig/gdb/i386-cygwin-tdep.c 2010-06-16 10:55:17.000000000 +0100 +++ src/gdb/i386-cygwin-tdep.c 2010-08-04 13:43:27.000000000 +0100 @@ -28,6 +28,7 @@ #include "gdbcore.h" #include "solib.h" #include "solib-target.h" +#include "inferior.h" /* Core file support. */ @@ -199,6 +200,22 @@ windows_core_xfer_shared_libraries (stru return len; } +/* This is how we want PTIDs from core files to be printed. */ + +static char * +i386_windows_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid) +{ + static char buf[80]; + + if (ptid_get_lwp (ptid) != 0) + { + snprintf (buf, sizeof (buf), "Thread 0x%lx", ptid_get_lwp (ptid)); + return buf; + } + + return normal_pid_to_str (ptid); +} + static CORE_ADDR i386_cygwin_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) { @@ -233,6 +250,7 @@ i386_cygwin_init_abi (struct gdbarch_inf (gdbarch, i386_windows_regset_from_core_section); set_gdbarch_core_xfer_shared_libraries (gdbarch, windows_core_xfer_shared_libraries); + set_gdbarch_core_pid_to_str (gdbarch, i386_windows_core_pid_to_str); set_gdbarch_auto_wide_charset (gdbarch, i386_cygwin_auto_wide_charset);