From 9231e41bc3f14de61889dd4ea6a2b21f0c3fd118 Mon Sep 17 00:00:00 2001 From: aoliva Date: Tue, 11 Jul 2006 06:33:02 +0000 Subject: [PATCH] - Upgrade to GDB 6.5. Drop redundant patches, forward-port remaining ones. --- .cvsignore | 1 + gdb-6.3-bt-past-zero-20051201.patch | 58 +- gdb-6.3-ctorline-20050120.patch | 133 +- gdb-6.3-dtorfix-20050121.patch | 20 +- gdb-6.3-gcore-thread-20050204.patch | 33 +- gdb-6.3-ia64-corefile-fix-20050127.patch | 23 +- gdb-6.3-ia64-gcore-page0-20050421.patch | 10 +- gdb-6.3-ia64-gcore-speedup-20050714.patch | 90 +- gdb-6.3-ia64-sigill-20051115.patch | 36 +- gdb-6.3-ia64-sigtramp-fp-20050926.patch | 24 +- gdb-6.3-ia64-vsyscall-20050330.patch | 65 +- gdb-6.3-inferior-notification-20050721.patch | 34 - gdb-6.3-inheritance-20050324.patch | 18 +- gdb-6.3-large-core-20051206.patch | 407 +- gdb-6.3-linespec-20041213.patch | 43 +- gdb-6.3-lwp-cache-20041216.patch | 6 +- gdb-6.3-nonthreaded-wp-20050117.patch | 80 +- gdb-6.3-pie-20050110.patch | 505 +- gdb-6.3-ppc64syscall-20040622.patch | 35 +- gdb-6.3-security-errata-20050610.patch | 3443 +----------- gdb-6.3-step-thread-exit-20050211.patch | 67 +- gdb-6.3-terminal-fix-20050214.patch | 17 +- gdb-6.3-test-pie-20050107.patch | 105 +- gdb-6.3-threaded-watchpoints-20041213.patch | 1522 +----- gdb-6.3-threaded-watchpoints2-20050225.patch | 158 +- gdb-6.3-warnings-20050317.patch | 5105 +----------------- gdb.spec | 116 +- sources | 2 +- 28 files changed, 1368 insertions(+), 10788 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3382a59..fec3f5a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ gdb-6.3.tar.bz2 +gdb-6.5.tar.bz2 diff --git a/gdb-6.3-bt-past-zero-20051201.patch b/gdb-6.3-bt-past-zero-20051201.patch index 5b6f5f7..5e654bd 100644 --- a/gdb-6.3-bt-past-zero-20051201.patch +++ b/gdb-6.3-bt-past-zero-20051201.patch @@ -11,8 +11,10 @@ testsuite/gdb.base: * setshow.exp: Add testing of "set backtrace past-zero-pc" option. ---- gdb-6.3/gdb/testsuite/gdb.base/setshow.exp.fix 2005-12-01 14:43:02.000000000 -0500 -+++ gdb-6.3/gdb/testsuite/gdb.base/setshow.exp 2005-12-01 14:43:20.000000000 -0500 +Index: gdb-6.5/gdb/testsuite/gdb.base/setshow.exp +=================================================================== +--- gdb-6.5.orig/gdb/testsuite/gdb.base/setshow.exp 2006-07-11 02:46:50.000000000 -0300 ++++ gdb-6.5/gdb/testsuite/gdb.base/setshow.exp 2006-07-11 02:47:24.000000000 -0300 @@ -1,4 +1,4 @@ -# Copyright 1992, 1994, 1996, 1997, 1998, 2001, 2003 +# Copyright 1992, 1994, 1996, 1997, 1998, 2001, 2003, 2005 @@ -36,17 +38,28 @@ testsuite/gdb.base: #test set check range on gdb_test "set check range on" "" "set check range on" #test show check range on ---- gdb-6.3/gdb/frame.c.fix 2005-12-01 14:42:47.000000000 -0500 -+++ gdb-6.3/gdb/frame.c 2005-12-01 14:44:08.000000000 -0500 -@@ -115,6 +115,7 @@ static int frame_debug; - /* Flag to indicate whether backtraces should stop at main et.al. */ +Index: gdb-6.5/gdb/frame.c +=================================================================== +--- gdb-6.5.orig/gdb/frame.c 2006-07-11 02:46:50.000000000 -0300 ++++ gdb-6.5/gdb/frame.c 2006-07-11 02:51:20.000000000 -0300 +@@ -131,6 +131,16 @@ Whether backtraces should continue past + value); + } - static int backtrace_past_main; +static int backtrace_past_zero_pc; - static unsigned int backtrace_limit = UINT_MAX; - ++static void ++show_backtrace_past_zero_pc (struct ui_file *file, int from_tty, ++ struct cmd_list_element *c, const char *value) ++{ ++ fprintf_filtered (file, _("\ ++Whether backtraces should continue past a zero pc value is %s.\n"), ++ value); ++} ++ + static int backtrace_past_entry; static void -@@ -1236,9 +1237,7 @@ get_prev_frame (struct frame_info *this_ + show_backtrace_past_entry (struct ui_file *file, int from_tty, +@@ -1313,9 +1323,7 @@ get_prev_frame (struct frame_info *this_ } if (this_frame->level > 0 @@ -57,20 +70,21 @@ testsuite/gdb.base: && get_frame_type (this_frame) == NORMAL_FRAME && get_frame_type (get_next_frame (this_frame)) == NORMAL_FRAME && get_frame_pc (this_frame) == 0) -@@ -1537,6 +1536,16 @@ Whether backtraces should continue past - NULL, NULL, &set_backtrace_cmdlist, +@@ -1629,6 +1637,17 @@ the rest of the stack trace."), + &set_backtrace_cmdlist, &show_backtrace_cmdlist); + add_setshow_boolean_cmd ("past-zero-pc", class_obscure, -+ &backtrace_past_zero_pc, "\ -+Set whether backtraces should continue past a zero pc value.", "\ -+Show whether backtraces should continue past a zero pc value..", "\ ++ &backtrace_past_zero_pc, _("\ ++Set whether backtraces should continue past a zero pc value."), _("\ ++Show whether backtraces should continue past a zero pc value."), _("\ +Normally GDB stops backtracing when it finds a zero pc.\n\ -+Set this variable if you need to see the rest of the stack trace.", "\ -+Whether backtraces should continue past a zero pc value is %s.", -+ NULL, NULL, &set_backtrace_cmdlist, -+ &show_backtrace_cmdlist); ++Set this variable if you need to see the rest of the stack trace."), ++ NULL, ++ show_backtrace_past_zero_pc, ++ &set_backtrace_cmdlist, ++ &show_backtrace_cmdlist); + - add_setshow_uinteger_cmd ("limit", class_obscure, - &backtrace_limit, "\ - Set an upper bound on the number of backtrace levels.", "\ + add_setshow_integer_cmd ("limit", class_obscure, + &backtrace_limit, _("\ + Set an upper bound on the number of backtrace levels."), _("\ diff --git a/gdb-6.3-ctorline-20050120.patch b/gdb-6.3-ctorline-20050120.patch index c73b5d0..afb0a9a 100644 --- a/gdb-6.3-ctorline-20050120.patch +++ b/gdb-6.3-ctorline-20050120.patch @@ -21,41 +21,46 @@ * tui/tui-win.c (make_visible_with_new_height): Ditto. * tui/tui-winsource.c (tui_update_source_windows_with_addr): Ditto. ---- gdb-6.3/gdb/mi/mi-cmd-disas.c.fix Thu Jan 20 18:45:16 2005 -+++ gdb-6.3/gdb/mi/mi-cmd-disas.c Thu Jan 20 19:08:00 2005 +Index: gdb-6.5/gdb/mi/mi-cmd-disas.c +=================================================================== +--- gdb-6.5.orig/gdb/mi/mi-cmd-disas.c 2006-07-11 01:30:43.000000000 -0300 ++++ gdb-6.5/gdb/mi/mi-cmd-disas.c 2006-07-11 02:16:07.000000000 -0300 @@ -1,5 +1,5 @@ /* MI Command Set - disassemble commands. -- Copyright 2000, 2001, 2002 Free Software Foundation, Inc. -+ Copyright 2000, 2001, 2002, 2005 Free Software Foundation, Inc. +- Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. ++ Copyright (C) 2000, 2001, 2002, 2005 Free Software Foundation, Inc. Contributed by Cygnus Solutions (a Red Hat company). This file is part of GDB. -@@ -145,11 +145,17 @@ mi_cmd_disassemble (char *command, char +@@ -145,11 +145,18 @@ mi_cmd_disassemble (char *command, char if (line_seen && file_seen) { + CORE_ADDR *pc_list; + int num_pc_values; ++ s = lookup_symtab (file_string); if (s == NULL) - error ("mi_cmd_disassemble: Invalid filename."); + error (_("mi_cmd_disassemble: Invalid filename.")); - if (!find_line_pc (s, line_num, &start)) + if (!find_line_pc (s, line_num, &pc_list, &num_pc_values)) - error ("mi_cmd_disassemble: Invalid line number"); + error (_("mi_cmd_disassemble: Invalid line number")); + /* FIXME: What do we do with multiple pc values for ctors/dtors + under mi? */ + start = pc_list[0]; + xfree (pc_list); if (find_pc_partial_function (start, NULL, &low, &high) == 0) - error ("mi_cmd_disassemble: No function contains specified address"); + error (_("mi_cmd_disassemble: No function contains specified address")); } ---- gdb-6.3/gdb/tui/tui-layout.c.fix Thu Jan 20 18:44:53 2005 -+++ gdb-6.3/gdb/tui/tui-layout.c Thu Jan 20 19:08:16 2005 +Index: gdb-6.5/gdb/tui/tui-layout.c +=================================================================== +--- gdb-6.5.orig/gdb/tui/tui-layout.c 2006-07-11 01:30:43.000000000 -0300 ++++ gdb-6.5/gdb/tui/tui-layout.c 2006-07-11 02:16:07.000000000 -0300 @@ -1,6 +1,6 @@ /* TUI layout window management. -- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software -+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software +- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software ++ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Contributed by Hewlett-Packard Company. @@ -72,7 +77,7 @@ @@ -520,8 +521,11 @@ extract_display_start_addr (void) case SRC_DATA_COMMAND: find_line_pc (cursal.symtab, - TUI_SRC_WIN->detail.source_info.start_line_or_addr.line_no, + TUI_SRC_WIN->detail.source_info.start_line_or_addr.u.line_no, - &pc); - addr = pc; + &pc_list, &num_pc_values); @@ -83,44 +88,49 @@ break; case DISASSEM_COMMAND: case SRC_DISASSEM_COMMAND: ---- gdb-6.3/gdb/tui/tui-win.c.fix Thu Jan 20 18:44:58 2005 -+++ gdb-6.3/gdb/tui/tui-win.c Thu Jan 20 19:08:24 2005 +Index: gdb-6.5/gdb/tui/tui-win.c +=================================================================== +--- gdb-6.5.orig/gdb/tui/tui-win.c 2006-07-11 01:30:43.000000000 -0300 ++++ gdb-6.5/gdb/tui/tui-win.c 2006-07-11 02:16:12.000000000 -0300 @@ -1,6 +1,6 @@ /* TUI window generic functions. -- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software -+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software - Foundation, Inc. +- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 ++ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Contributed by Hewlett-Packard Company. -@@ -1313,7 +1313,15 @@ make_visible_with_new_height (struct tui - line.line_no = cursal.line; +@@ -1342,8 +1342,16 @@ make_visible_with_new_height (struct tui + } else { -- find_line_pc (s, cursal.line, &line.addr); + CORE_ADDR *pc_list; + int num_pc_values; + line.loa = LOA_ADDRESS; +- find_line_pc (s, cursal.line, &line.u.addr); + if (find_line_pc (s, cursal.line, &pc_list, &num_pc_values)) + { + /* FIXME: What do we do with multiple pc values for + ctors/dtors and inlined functions? */ -+ line.addr = pc_list[0]; ++ line.u.addr = pc_list[0]; + xfree (pc_list); + } } tui_update_source_window (win_info, s, line, TRUE); } ---- gdb-6.3/gdb/tui/tui-winsource.c.fix Thu Jan 20 18:45:04 2005 -+++ gdb-6.3/gdb/tui/tui-winsource.c Thu Jan 20 19:08:34 2005 +Index: gdb-6.5/gdb/tui/tui-winsource.c +=================================================================== +--- gdb-6.5.orig/gdb/tui/tui-winsource.c 2006-07-11 01:30:43.000000000 -0300 ++++ gdb-6.5/gdb/tui/tui-winsource.c 2006-07-11 01:39:20.000000000 -0300 @@ -1,6 +1,6 @@ /* TUI display source/assembly window. -- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software -+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software - Foundation, Inc. +- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 ++ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Contributed by Hewlett-Packard Company. -@@ -171,14 +171,21 @@ tui_update_source_windows_with_addr (COR +@@ -173,14 +173,21 @@ tui_update_source_windows_with_addr (COR void tui_update_source_windows_with_line (struct symtab *s, int line) { @@ -128,7 +138,7 @@ + CORE_ADDR pc = 0; + CORE_ADDR *pc_list; + int num_pc_values; - union tui_line_or_address l; + struct tui_line_or_address l; switch (tui_current_layout ()) { @@ -144,7 +154,7 @@ tui_update_source_windows_with_addr (pc); break; default: -@@ -186,7 +193,12 @@ tui_update_source_windows_with_line (str +@@ -189,7 +196,12 @@ tui_update_source_windows_with_line (str tui_show_symtab_source (s, l, FALSE); if (tui_current_layout () == SRC_DISASSEM_COMMAND) { @@ -158,18 +168,20 @@ tui_show_disassem (pc); } break; ---- gdb-6.3/gdb/symtab.c.fix Thu Jan 20 18:44:33 2005 -+++ gdb-6.3/gdb/symtab.c Thu Jan 20 19:07:26 2005 +Index: gdb-6.5/gdb/symtab.c +=================================================================== +--- gdb-6.5.orig/gdb/symtab.c 2006-07-11 01:30:43.000000000 -0300 ++++ gdb-6.5/gdb/symtab.c 2006-07-11 02:16:05.000000000 -0300 @@ -1,7 +1,7 @@ /* Symbol table lookup for the GNU debugger, GDB. - Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, + Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GDB. -@@ -72,7 +72,9 @@ static void sources_info (char *, int); +@@ -73,7 +73,9 @@ static void sources_info (char *, int); static void output_source_filename (const char *, int *); @@ -180,7 +192,7 @@ /* This one is used by linespec.c */ -@@ -2230,6 +2232,9 @@ find_pc_line (CORE_ADDR pc, int notcurre +@@ -2233,6 +2235,9 @@ find_pc_line (CORE_ADDR pc, int notcurre /* Find line number LINE in any symtab whose name is the same as SYMTAB. @@ -190,7 +202,7 @@ If found, return the symtab that contains the linetable in which it was found, set *INDEX to the index in the linetable of the best entry found, and set *EXACT_MATCH nonzero if the value returned is an -@@ -2246,13 +2251,19 @@ find_line_symtab (struct symtab *symtab, +@@ -2249,13 +2254,19 @@ find_line_symtab (struct symtab *symtab, so far seen. */ int best_index; @@ -211,7 +223,7 @@ if (best_index < 0 || !exact) { /* Didn't find an exact match. So we better keep looking for -@@ -2283,7 +2294,7 @@ find_line_symtab (struct symtab *symtab, +@@ -2286,7 +2297,7 @@ find_line_symtab (struct symtab *symtab, if (strcmp (symtab->filename, s->filename) != 0) continue; l = LINETABLE (s); @@ -220,7 +232,7 @@ if (ind >= 0) { if (exact) -@@ -2319,13 +2330,23 @@ done: +@@ -2322,13 +2333,23 @@ done: Returns zero for invalid line number (and sets the PC to 0). The source file is specified with a struct symtab. */ @@ -247,7 +259,7 @@ if (symtab == 0) return 0; -@@ -2333,7 +2354,50 @@ find_line_pc (struct symtab *symtab, int +@@ -2336,7 +2357,50 @@ find_line_pc (struct symtab *symtab, int if (symtab != NULL) { l = LINETABLE (symtab); @@ -299,7 +311,7 @@ return 1; } else -@@ -2351,12 +2415,22 @@ find_line_pc_range (struct symtab_and_li +@@ -2354,12 +2418,22 @@ find_line_pc_range (struct symtab_and_li CORE_ADDR *endptr) { CORE_ADDR startaddr; @@ -323,7 +335,7 @@ /* This whole function is based on address. For example, if line 10 has two parts, one from 0x100 to 0x200 and one from 0x300 to 0x400, then "info line *0x123" should say the line goes from 0x100 to 0x200 -@@ -2386,7 +2460,7 @@ find_line_pc_range (struct symtab_and_li +@@ -2389,7 +2463,7 @@ find_line_pc_range (struct symtab_and_li Set *EXACT_MATCH nonzero if the value returned is an exact match. */ static int @@ -332,7 +344,7 @@ int *exact_match) { int i; -@@ -2405,7 +2479,7 @@ find_line_common (struct linetable *l, i +@@ -2408,7 +2482,7 @@ find_line_common (struct linetable *l, i return -1; len = l->nitems; @@ -341,7 +353,7 @@ { struct linetable_entry *item = &(l->item[i]); -@@ -2429,6 +2503,52 @@ find_line_common (struct linetable *l, i +@@ -2432,6 +2506,52 @@ find_line_common (struct linetable *l, i return best_index; } @@ -394,12 +406,14 @@ int find_pc_line_pc_range (CORE_ADDR pc, CORE_ADDR *startptr, CORE_ADDR *endptr) { ---- gdb-6.3/gdb/symtab.h.fix Thu Jan 20 18:44:38 2005 -+++ gdb-6.3/gdb/symtab.h Thu Jan 20 19:07:41 2005 +Index: gdb-6.5/gdb/symtab.h +=================================================================== +--- gdb-6.5.orig/gdb/symtab.h 2006-07-11 01:30:43.000000000 -0300 ++++ gdb-6.5/gdb/symtab.h 2006-07-11 01:39:20.000000000 -0300 @@ -1,7 +1,7 @@ /* Symbol table definitions for GDB. - Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, + Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software + 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @@ -423,18 +437,11 @@ /* Given a string, return the line specified by it. For commands like "list" and "breakpoint". */ ---- gdb-6.3/gdb/breakpoint.c.fix Thu Jan 20 18:44:42 2005 -+++ gdb-6.3/gdb/breakpoint.c Thu Jan 20 19:07:48 2005 -@@ -1,7 +1,7 @@ - /* Everything about breakpoints, for GDB. - - Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, -- 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -+ 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This file is part of GDB. -@@ -5231,10 +5231,40 @@ static void +Index: gdb-6.5/gdb/breakpoint.c +=================================================================== +--- gdb-6.5.orig/gdb/breakpoint.c 2006-07-11 01:30:53.000000000 -0300 ++++ gdb-6.5/gdb/breakpoint.c 2006-07-11 01:39:20.000000000 -0300 +@@ -5268,10 +5268,40 @@ static void breakpoint_sals_to_pc (struct symtabs_and_lines *sals, char *address) { @@ -479,7 +486,7 @@ /* It's possible for the PC to be nonzero, but still an illegal value on some targets. -@@ -5364,6 +5394,10 @@ break_command_1 (char *arg, int flag, in +@@ -5406,6 +5436,10 @@ break_command_1 (char *arg, int flag, in if (!pending) { @@ -490,7 +497,7 @@ /* Make sure that all storage allocated to SALS gets freed. */ make_cleanup (xfree, sals.sals); -@@ -5394,11 +5428,6 @@ break_command_1 (char *arg, int flag, in +@@ -5436,11 +5470,6 @@ break_command_1 (char *arg, int flag, in make_cleanup (xfree, addr_string[i]); } @@ -502,7 +509,7 @@ /* Verify that condition can be parsed, before setting any breakpoints. Allocate a separate condition expression for each breakpoint. */ -@@ -5629,14 +5658,16 @@ gdb_breakpoint (char *address, char *con +@@ -5670,14 +5699,16 @@ gdb_breakpoint (char *address, char *con void resolve_sal_pc (struct symtab_and_line *sal) { @@ -514,7 +521,7 @@ { - if (!find_line_pc (sal->symtab, sal->line, &pc)) + if (!find_line_pc (sal->symtab, sal->line, &pc_list, &num_pc_values)) - error ("No line %d in file \"%s\".", + error (_("No line %d in file \"%s\"."), sal->line, sal->symtab->filename); - sal->pc = pc; + sal->pc = pc_list[0]; @@ -522,7 +529,7 @@ } if (sal->section == 0 && sal->symtab != NULL) -@@ -5673,6 +5704,54 @@ resolve_sal_pc (struct symtab_and_line * +@@ -5714,6 +5745,54 @@ resolve_sal_pc (struct symtab_and_line * } } diff --git a/gdb-6.3-dtorfix-20050121.patch b/gdb-6.3-dtorfix-20050121.patch index 77ba86f..3ff4144 100644 --- a/gdb-6.3-dtorfix-20050121.patch +++ b/gdb-6.3-dtorfix-20050121.patch @@ -4,9 +4,11 @@ destructors as this will be handled in find_methods. (find_methods): Fix ctor check to also check for dtor. ---- gdb-6.3/gdb/linespec.c.fix Fri Jan 21 17:03:18 2005 -+++ gdb-6.3/gdb/linespec.c Fri Jan 21 17:04:39 2005 -@@ -375,12 +375,14 @@ add_matching_methods (int method_counter +Index: gdb-6.5/gdb/linespec.c +=================================================================== +--- gdb-6.5.orig/gdb/linespec.c 2006-07-07 01:04:56.000000000 -0300 ++++ gdb-6.5/gdb/linespec.c 2006-07-07 02:05:35.000000000 -0300 +@@ -377,12 +377,14 @@ add_matching_methods (int method_counter /* Check for special case of looking for member that doesn't have a mangled name provided. This will happen @@ -15,16 +17,16 @@ Since we don't have a mangled name to work with, if we - look for the symbol, we can only find the class itself. + look for the symbol, we can at best find the class itself. - We can find the information we need in the minimal symbol + We can find the information we need in the minimal symbol table which has the full member name information we need. */ - if (strlen (phys_name) <= strlen (class_name)) -+ if (strlen (phys_name) <= strlen (class_name) -+ || (strlen (phys_name) == strlen (class_name) + 1 -+ && phys_name[0] == '~')) ++ if (strlen (phys_name) <= strlen (class_name) ++ || (strlen (phys_name) == strlen (class_name) + 1 ++ && phys_name[0] == '~')) return add_minsym_members (class_name, phys_name, msym_arr); /* Destructor is handled by caller, don't add it to -@@ -1707,6 +1709,11 @@ collect_methods (char *copy, struct type +@@ -1709,6 +1711,11 @@ collect_methods (char *copy, struct type { int i1 = 0; /* Counter for the symbol array. */ @@ -36,7 +38,7 @@ if (destructor_name_p (copy, t)) { /* Destructors are a special case. */ -@@ -1725,6 +1732,7 @@ collect_methods (char *copy, struct type +@@ -1727,6 +1734,7 @@ collect_methods (char *copy, struct type } } else diff --git a/gdb-6.3-gcore-thread-20050204.patch b/gdb-6.3-gcore-thread-20050204.patch index aaa46ec..8b51aa3 100644 --- a/gdb-6.3-gcore-thread-20050204.patch +++ b/gdb-6.3-gcore-thread-20050204.patch @@ -3,28 +3,23 @@ * linux-nat.c (linux_nat_xfer_memory): Don't use linux_proc_xfer_memory for ia64. ---- gdb-6.3/gdb/linux-nat.c.fix Fri Feb 4 22:52:40 2005 -+++ gdb-6.3/gdb/linux-nat.c Tue Feb 8 15:49:09 2005 -@@ -2381,12 +2381,22 @@ linux_nat_xfer_memory (CORE_ADDR memaddr - struct cleanup *old_chain = save_inferior_ptid (); - int xfer; +Index: gdb-6.5/gdb/linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/linux-nat.c 2006-07-07 00:57:56.000000000 -0300 ++++ gdb-6.5/gdb/linux-nat.c 2006-07-07 02:24:51.000000000 -0300 +@@ -3152,10 +3152,15 @@ linux_xfer_partial (struct target_ops *o + return procfs_xfer_auxv (ops, object, annex, readbuf, writebuf, + offset, len); -+#ifdef NATIVE_XFER_UNWIND_TABLE ++#ifndef NATIVE_XFER_UNWIND_TABLE + /* FIXME: For ia64, we cannot currently use linux_proc_xfer_memory + for accessing thread storage. Revert when Bugzilla 147436 + is fixed. */ -+ if (is_lwp (inferior_ptid)) -+ inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid)); -+ -+ xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target); -+#else - if (is_lwp (inferior_ptid)) - inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid)); - - xfer = linux_proc_xfer_memory (memaddr, myaddr, len, write, attrib, target); - if (xfer == 0) - xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target); + xfer = linux_proc_xfer_partial (ops, object, annex, readbuf, writebuf, + offset, len); + if (xfer != 0) + return xfer; +#endif - do_cleanups (old_chain); - return xfer; + return super_xfer_partial (ops, object, annex, readbuf, writebuf, + offset, len); diff --git a/gdb-6.3-ia64-corefile-fix-20050127.patch b/gdb-6.3-ia64-corefile-fix-20050127.patch index b253775..45a84cc 100644 --- a/gdb-6.3-ia64-corefile-fix-20050127.patch +++ b/gdb-6.3-ia64-corefile-fix-20050127.patch @@ -4,20 +4,23 @@ unwind table syscall to support backtracing from syscalls in a corefile. ---- gdb-6.3/gdb/ia64-tdep.c.fix Thu Jan 27 12:03:40 2005 -+++ gdb-6.3/gdb/ia64-tdep.c Thu Jan 27 12:06:23 2005 -@@ -2357,8 +2357,14 @@ static int - getunwind_table (void *buf, size_t len) - { - LONGEST x; -- x = target_read_partial (¤t_target, TARGET_OBJECT_UNWIND_TABLE, NULL, -- buf, 0, len); -+ +Index: gdb-6.5/gdb/ia64-tdep.c +=================================================================== +--- gdb-6.5.orig/gdb/ia64-tdep.c 2006-04-18 16:20:06.000000000 -0300 ++++ gdb-6.5/gdb/ia64-tdep.c 2006-07-07 02:18:40.000000000 -0300 +@@ -2470,8 +2470,17 @@ getunwind_table (void *buf, size_t len) + we want to preserve fall back to the running kernel's table, then + we should find a way to override the corefile layer's + xfer_partial method. */ ++#if 0 + x = target_read_partial (¤t_target, TARGET_OBJECT_UNWIND_TABLE, NULL, + buf, 0, len); ++#endif + /* FIXME: This is a temporary solution to backtracing syscalls in corefiles. + To do this properly, the AUXV section should be used. This + fix will work as long as the kernel used to generate the corefile + is equivalent to the kernel used to debug the corefile. */ -+ x = ia64_linux_xfer_unwind_table (¤t_target, ++ x = ia64_linux_xfer_unwind_table (¤t_target, + TARGET_OBJECT_UNWIND_TABLE, NULL, + buf, NULL, 0, len); diff --git a/gdb-6.3-ia64-gcore-page0-20050421.patch b/gdb-6.3-ia64-gcore-page0-20050421.patch index d8c0837..13bbdc4 100644 --- a/gdb-6.3-ia64-gcore-page0-20050421.patch +++ b/gdb-6.3-ia64-gcore-page0-20050421.patch @@ -1,7 +1,9 @@ ---- gdb-6.3/gdb/gcore.c.fix 2005-04-21 15:13:23.000000000 -0400 -+++ gdb-6.3/gdb/gcore.c 2005-04-21 15:16:48.000000000 -0400 +Index: gdb-6.5/gdb/gcore.c +=================================================================== +--- gdb-6.5.orig/gdb/gcore.c 2005-12-17 20:33:59.000000000 -0200 ++++ gdb-6.5/gdb/gcore.c 2006-07-07 02:41:33.000000000 -0300 @@ -462,8 +462,13 @@ gcore_copy_callback (bfd *obfd, asection - error ("Not enough memory to create corefile."); + error (_("Not enough memory to create corefile.")); old_chain = make_cleanup (xfree, memhunk); + /* Warn if read error occurs except if we were trying to read the @@ -12,6 +14,6 @@ + memhunk, size) != 0 + && (strcmp (TARGET_ARCHITECTURE->arch_name, "ia64") + || bfd_section_vma (obfd, osec) != 0)) - warning ("Memory read failed for corefile section, %s bytes at 0x%s\n", + warning (_("Memory read failed for corefile section, %s bytes at 0x%s."), paddr_d (size), paddr (bfd_section_vma (obfd, osec))); if (!bfd_set_section_contents (obfd, osec, memhunk, 0, size)) diff --git a/gdb-6.3-ia64-gcore-speedup-20050714.patch b/gdb-6.3-ia64-gcore-speedup-20050714.patch index 093d9dc..69d1924 100644 --- a/gdb-6.3-ia64-gcore-speedup-20050714.patch +++ b/gdb-6.3-ia64-gcore-speedup-20050714.patch @@ -7,58 +7,68 @@ (ia64_rse_skip_regs): Ditto. (ia64_linux_check_stack_region): New function. ---- gdb-6.3/gdb/linux-nat.c.fix 2005-07-14 17:53:13.000000000 -0400 -+++ gdb-6.3/gdb/linux-nat.c 2005-07-14 19:31:00.000000000 -0400 -@@ -2438,7 +2438,9 @@ linux_nat_mourn_inferior (void) - - deprecated_child_ops.to_mourn_inferior (); +Index: gdb-6.5/gdb/linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/linux-nat.c 2006-07-07 02:29:12.000000000 -0300 ++++ gdb-6.5/gdb/linux-nat.c 2006-07-07 03:03:55.000000000 -0300 +@@ -2473,7 +2473,9 @@ linux_nat_xfer_partial (struct target_op + do_cleanups (old_chain); + return xfer; } - +#ifdef NATIVE_XFER_UNWIND_TABLE +extern int ia64_linux_check_stack_region(struct lwp_info *lwp, void *range); +#endif static int - linux_nat_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, - struct mem_attrib *attrib, struct target_ops *target) -@@ -2446,14 +2448,29 @@ linux_nat_xfer_memory (CORE_ADDR memaddr - struct cleanup *old_chain = save_inferior_ptid (); - int xfer; + linux_nat_thread_alive (ptid_t ptid) + { +@@ -3214,15 +3216,34 @@ linux_xfer_partial (struct target_ops *o + return procfs_xfer_auxv (ops, object, annex, readbuf, writebuf, + offset, len); --#ifdef NATIVE_XFER_UNWIND_TABLE +-#ifndef NATIVE_XFER_UNWIND_TABLE - /* FIXME: For ia64, we cannot currently use linux_proc_xfer_memory - for accessing thread storage. Revert when Bugzilla 147436 +- is fixed. */ + xfer = linux_proc_xfer_partial (ops, object, annex, readbuf, writebuf, + offset, len); + if (xfer != 0) +- return xfer; ++ { +#ifdef NATIVE_XFER_UNWIND_TABLE -+ struct mem_region range; -+ range.lo = memaddr; -+ range.hi = memaddr + len; ++ struct mem_region range; ++ range.lo = memaddr; ++ range.hi = memaddr + len; + -+ /* FIXME: For ia64, we cannot currently trust linux_proc_xfer_memory -+ for accessing rse register storage. Revert when Bugzilla 147436 - is fixed. */ - if (is_lwp (inferior_ptid)) - inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid)); - -- xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target); -+ xfer = linux_proc_xfer_memory (memaddr, myaddr, len, write, attrib, target); -+ if (xfer == 0) -+ xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target); -+ else if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL) -+ { /* This region contains ia64 rse registers, we have to re-read. */ -+ int xxfer; -+ /* Re-read register stack area. */ -+ xxfer = child_xfer_memory (range.lo, myaddr + (range.lo - memaddr), -+ range.hi - range.lo, write, attrib, target); -+ if (xxfer == 0) -+ xfer = 0; ++ /* FIXME: For ia64, we cannot currently use ++ linux_proc_xfer_partial for accessing rse register storage. ++ Revert when Bugzilla 147436 is fixed. */ ++ if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL) ++ { /* This region contains ia64 rse registers, we have to re-read. */ ++ int xxfer; ++ ++ /* Re-read register stack area. */ ++ xxfer = super_xfer_partial (ops, object, annex, ++ readbuf + (range.lo - memaddr), ++ writebuf + (range.lo - memaddr), ++ offset + (range.lo - memaddr), ++ range.hi - range.lo); ++ if (xxfer == 0) ++ xfer = 0; ++ } + #endif ++ return xfer; + } - #else - if (is_lwp (inferior_ptid)) - inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid)); ---- gdb-6.3/gdb/ia64-linux-nat.c.fix 2005-07-14 17:54:43.000000000 -0400 -+++ gdb-6.3/gdb/ia64-linux-nat.c 2005-07-14 17:55:19.000000000 -0400 -@@ -784,6 +784,64 @@ ia64_linux_save_sigtrap_info (void *queu - lp->saved_trap_data); - } + + return super_xfer_partial (ops, object, annex, readbuf, writebuf, + offset, len); +Index: gdb-6.5/gdb/ia64-linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/ia64-linux-nat.c 2006-03-24 20:08:16.000000000 -0300 ++++ gdb-6.5/gdb/ia64-linux-nat.c 2006-07-07 02:52:25.000000000 -0300 +@@ -687,6 +687,64 @@ ia64_linux_xfer_partial (struct target_o + + void _initialize_ia64_linux_nat (void); +/* + * Note: taken from ia64_tdep.c diff --git a/gdb-6.3-ia64-sigill-20051115.patch b/gdb-6.3-ia64-sigill-20051115.patch index 0eece4c..b9eb872 100644 --- a/gdb-6.3-ia64-sigill-20051115.patch +++ b/gdb-6.3-ia64-sigill-20051115.patch @@ -1,6 +1,6 @@ 2005-11-15 Jeff Johnston - * thread-db.c (thread_db_wait): Don't bother continuing if + * linux-thread-db.c (thread_db_wait): Don't bother continuing if the wait result indicates the program terminated with a signal. * linux-nat.c (linux_nat_wait): For SIGILL and SIGTRAP, don't throw away the event if the user has specified nostop noprint. @@ -12,8 +12,10 @@ gdb/testsuite: * gdb.arch/ia64-sigill.c: New test. * gdb.arch/ia64-sigill.exp: Ditto. ---- gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigill.exp.fix 2005-11-15 17:52:56.000000000 -0500 -+++ gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigill.exp 2005-11-15 17:52:10.000000000 -0500 +Index: gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.exp 2006-07-07 03:16:54.000000000 -0300 @@ -0,0 +1,59 @@ +# Copyright 2005 Free Software Foundation, Inc. + @@ -74,8 +76,10 @@ gdb/testsuite: +gdb_test "handle SIGILL nostop noprint" "SIGILL.*No.*No.*Yes.*" "handle sigill" +gdb_test "run" "Starting program.*ia64-sigill.*\[New thread.*\].*hello world.*Program exited normally." "run to exit" + ---- gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigill.c.fix 2005-11-15 17:53:02.000000000 -0500 -+++ gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigill.c 2005-11-15 17:52:05.000000000 -0500 +Index: gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.c 2006-07-07 03:16:54.000000000 -0300 @@ -0,0 +1,8 @@ +#include + @@ -85,9 +89,11 @@ gdb/testsuite: + return 0; +} + ---- gdb-6.3/gdb/thread-db.c.fix 2005-11-15 17:51:09.000000000 -0500 -+++ gdb-6.3/gdb/thread-db.c 2005-11-15 17:51:50.000000000 -0500 -@@ -930,7 +930,8 @@ thread_db_wait (ptid_t ptid, struct targ +Index: gdb-6.5/gdb/linux-thread-db.c +=================================================================== +--- gdb-6.5.orig/gdb/linux-thread-db.c 2006-07-07 01:06:36.000000000 -0300 ++++ gdb-6.5/gdb/linux-thread-db.c 2006-07-07 03:16:54.000000000 -0300 +@@ -926,7 +926,8 @@ thread_db_wait (ptid_t ptid, struct targ post-processing and bail out early. */ return ptid; @@ -97,9 +103,11 @@ gdb/testsuite: return pid_to_ptid (-1); if (ourstatus->kind == TARGET_WAITKIND_STOPPED ---- gdb-6.3/gdb/linux-nat.c.fix 2005-11-15 17:51:14.000000000 -0500 -+++ gdb-6.3/gdb/linux-nat.c 2005-11-15 17:51:46.000000000 -0500 -@@ -2216,7 +2216,8 @@ retry: +Index: gdb-6.5/gdb/linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/linux-nat.c 2006-07-07 03:03:55.000000000 -0300 ++++ gdb-6.5/gdb/linux-nat.c 2006-07-07 03:16:54.000000000 -0300 +@@ -2209,7 +2209,8 @@ retry: threads can be a bit time-consuming so if we want decent performance with heavily multi-threaded programs, especially when they're using a high frequency timer, we'd better avoid it if we @@ -109,9 +117,9 @@ gdb/testsuite: if (WIFSTOPPED (status)) { -@@ -2224,7 +2225,9 @@ retry: - - if (signal_stop_state (signo) == 0 +@@ -2220,7 +2221,9 @@ retry: + if (!lp->step + && signal_stop_state (signo) == 0 && signal_print_state (signo) == 0 - && signal_pass_state (signo) == 1) + && signal_pass_state (signo) == 1 diff --git a/gdb-6.3-ia64-sigtramp-fp-20050926.patch b/gdb-6.3-ia64-sigtramp-fp-20050926.patch index 5052464..aa31f24 100644 --- a/gdb-6.3-ia64-sigtramp-fp-20050926.patch +++ b/gdb-6.3-ia64-sigtramp-fp-20050926.patch @@ -12,8 +12,10 @@ the base address using the current stack pointer plus a fixed offset. ---- gdb-6.3/gdb/libunwind-frame.c.fix 2005-09-26 14:45:45.000000000 -0400 -+++ gdb-6.3/gdb/libunwind-frame.c 2005-09-26 14:46:27.000000000 -0400 +Index: gdb-6.5/gdb/libunwind-frame.c +=================================================================== +--- gdb-6.5.orig/gdb/libunwind-frame.c 2006-07-07 03:04:32.000000000 -0300 ++++ gdb-6.5/gdb/libunwind-frame.c 2006-07-07 03:07:33.000000000 -0300 @@ -62,6 +62,7 @@ static unw_word_t (*unw_find_dyn_list_p) struct libunwind_frame_cache { @@ -56,7 +58,7 @@ - uw_sp_regnum = descr->gdb2uw (SP_REGNUM); ret = unw_get_reg_p (&cache->cursor, uw_sp_regnum, &fp); if (ret < 0) - error ("Can't get libunwind sp register."); + error (_("Can't get libunwind sp register.")); + cache->sp = (CORE_ADDR)sp; cache->base = (CORE_ADDR)fp; @@ -103,8 +105,10 @@ return NULL; } ---- gdb-6.3/gdb/libunwind-frame.h.fix 2005-09-26 14:45:57.000000000 -0400 -+++ gdb-6.3/gdb/libunwind-frame.h 2005-09-26 14:46:30.000000000 -0400 +Index: gdb-6.5/gdb/libunwind-frame.h +=================================================================== +--- gdb-6.5.orig/gdb/libunwind-frame.h 2006-07-07 02:51:32.000000000 -0300 ++++ gdb-6.5/gdb/libunwind-frame.h 2006-07-07 03:05:49.000000000 -0300 @@ -49,6 +49,9 @@ void libunwind_frame_set_descr (struct g void libunwind_frame_this_id (struct frame_info *next_frame, void **this_cache, @@ -115,9 +119,11 @@ void libunwind_frame_prev_register (struct frame_info *next_frame, void **this_cache, int regnum, int *optimizedp, enum lval_type *lvalp, CORE_ADDR *addrp, ---- gdb-6.3/gdb/ia64-tdep.c.fix 2005-09-26 14:46:04.000000000 -0400 -+++ gdb-6.3/gdb/ia64-tdep.c 2005-09-26 14:46:22.000000000 -0400 -@@ -3035,7 +3035,7 @@ ia64_libunwind_sigtramp_frame_this_id (s +Index: gdb-6.5/gdb/ia64-tdep.c +=================================================================== +--- gdb-6.5.orig/gdb/ia64-tdep.c 2006-07-07 02:51:32.000000000 -0300 ++++ gdb-6.5/gdb/ia64-tdep.c 2006-07-07 03:05:49.000000000 -0300 +@@ -3031,7 +3031,7 @@ ia64_libunwind_sigtramp_frame_this_id (s struct frame_id id; CORE_ADDR prev_ip; @@ -126,7 +132,7 @@ if (frame_id_eq (id, null_frame_id)) { (*this_id) = null_frame_id; -@@ -3047,8 +3047,14 @@ ia64_libunwind_sigtramp_frame_this_id (s +@@ -3043,8 +3043,14 @@ ia64_libunwind_sigtramp_frame_this_id (s frame_unwind_register (next_frame, IA64_BSP_REGNUM, buf); bsp = extract_unsigned_integer (buf, 8); diff --git a/gdb-6.3-ia64-vsyscall-20050330.patch b/gdb-6.3-ia64-vsyscall-20050330.patch index 69da626..8a697c6 100644 --- a/gdb-6.3-ia64-vsyscall-20050330.patch +++ b/gdb-6.3-ia64-vsyscall-20050330.patch @@ -1,64 +1,13 @@ 2005-03-30 Jeff Johnston - * gdb/ia64-tdep.c (ia64_find_unwind_table): Change code to - allow for idiosyncrasies of ia64 vsyscall page. - * bfd/elfcode.h: Ditto. + * bfd/elfcode.h: Change code to allow for idiosyncrasies of + ia64 vsyscall page. ---- gdb-6.3/gdb/ia64-tdep.c.fix 2005-03-30 13:34:00.000000000 -0500 -+++ gdb-6.3/gdb/ia64-tdep.c 2005-03-30 13:36:45.000000000 -0500 -@@ -2449,16 +2449,35 @@ ia64_find_unwind_table (struct objfile * - } - } - -- if (!p_text || !p_unwind -- /* Verify that the segment that contains the IP also contains -- the static unwind table. If not, we are dealing with -- runtime-generated code, for which we have no info here. */ -- || (p_unwind->p_vaddr - p_text->p_vaddr) >= p_text->p_memsz) -+ if (!p_text || !p_unwind) - return -UNW_ENOINFO; - -+ /* Verify that the segment that contains the IP also contains -+ the static unwind table. If not, we may be in the Linux kernel's -+ DSO gate page in which case the unwind table is another segment. -+ Otherwise, we are dealing with runtime-generated code, for which we -+ have no info here. */ - segbase = p_text->p_vaddr + load_base; - -- dip->start_ip = segbase; -+ if ((p_unwind->p_vaddr - p_text->p_vaddr) >= p_text->p_memsz) -+ { -+ int ok = 0; -+ for (i = 0; i < ehdr->e_phnum; ++i) -+ { -+ if (phdr[i].p_type == PT_LOAD -+ && (p_unwind->p_vaddr - phdr[i].p_vaddr) < phdr[i].p_memsz) -+ { -+ ok = 1; -+ /* Get the segbase from the section containing the -+ libunwind table. */ -+ segbase = phdr[i].p_vaddr + load_base; -+ } -+ } -+ if (!ok) -+ return -UNW_ENOINFO; -+ } -+ -+ dip->start_ip = p_text->p_vaddr + load_base; - dip->end_ip = dip->start_ip + p_text->p_memsz; - dip->gp = FIND_GLOBAL_POINTER (ip); - dip->format = UNW_INFO_FORMAT_REMOTE_TABLE; ---- gdb-6.3/bfd/elfcode.h.fix 2005-03-30 13:34:53.000000000 -0500 -+++ gdb-6.3/bfd/elfcode.h 2005-03-30 13:37:48.000000000 -0500 -@@ -1,6 +1,6 @@ - /* ELF executable support for BFD. - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -- 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+ 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - - Written by Fred Fish @ Cygnus Support, from information published - in "UNIX System V Release 4, Programmers Guide: ANSI C and -@@ -1619,7 +1619,8 @@ NAME(_bfd_elf,bfd_from_remote_memory) +Index: gdb-6.5/bfd/elfcode.h +=================================================================== +--- gdb-6.5.orig/bfd/elfcode.h 2006-05-11 05:57:08.000000000 -0300 ++++ gdb-6.5/bfd/elfcode.h 2006-07-07 02:36:03.000000000 -0300 +@@ -1625,7 +1625,8 @@ NAME(_bfd_elf,bfd_from_remote_memory) if (segment_end > (bfd_vma) contents_size) contents_size = segment_end; diff --git a/gdb-6.3-inferior-notification-20050721.patch b/gdb-6.3-inferior-notification-20050721.patch index 7056e1a..3b3325c 100644 --- a/gdb-6.3-inferior-notification-20050721.patch +++ b/gdb-6.3-inferior-notification-20050721.patch @@ -1,11 +1,3 @@ -2004-11-07 Andrew Cagney - Daniel Jacobowitz - Roland McGrath - - * inftarg.c (child_attach): Notify any observers of - inferior creation. - * inf-ptrace.c (inf_ptrace_attach): Ditto. - 2005-07-21 Jeff Johnston * gdb.base/attach-32.exp: New test for attaching in 32-bit @@ -13,19 +5,6 @@ * gdb.base/attach-32.c: Ditto. * gdb.base/attach-32b.c: Ditto. ---- gdb-6.3/gdb/inftarg.c.fix3 2005-07-21 13:43:05.000000000 -0400 -+++ gdb-6.3/gdb/inftarg.c 2005-07-21 13:45:17.000000000 -0400 -@@ -211,6 +211,10 @@ child_attach (char *args, int from_tty) - - inferior_ptid = pid_to_ptid (pid); - push_target (&deprecated_child_ops); -+ -+ /* Do this first, before anything has had a chance to query the -+ inferior's symbol table or similar. */ -+ observer_notify_inferior_created (¤t_target, from_tty); - } - - #if !defined(CHILD_POST_ATTACH) --- gdb-6.3/gdb/testsuite/gdb.base/attach-32.c.fix3 2005-07-21 14:23:50.000000000 -0400 +++ gdb-6.3/gdb/testsuite/gdb.base/attach-32.c 2005-07-21 14:05:56.000000000 -0400 @@ -0,0 +1,20 @@ @@ -326,16 +305,3 @@ + } + return (0); +} ---- gdb-6.3/gdb/inf-ptrace.c.fix3 2005-07-21 13:44:34.000000000 -0400 -+++ gdb-6.3/gdb/inf-ptrace.c 2005-07-21 13:45:59.000000000 -0400 -@@ -220,6 +220,10 @@ inf_ptrace_attach (char *args, int from_ - - inferior_ptid = pid_to_ptid (pid); - push_target (ptrace_ops_hack); -+ -+ /* Do this first, before anything has had a chance to query the -+ inferior's symbol table or similar. */ -+ observer_notify_inferior_created (¤t_target, from_tty); - } - - static void diff --git a/gdb-6.3-inheritance-20050324.patch b/gdb-6.3-inheritance-20050324.patch index cefeab0..ba9907c 100644 --- a/gdb-6.3-inheritance-20050324.patch +++ b/gdb-6.3-inheritance-20050324.patch @@ -3,24 +3,18 @@ * valops.c (check_field_in): Use check_typedef for base classes to avoid problems with opaque type references. ---- gdb-6.3/gdb/valops.c.fix 2005-03-24 19:07:09.000000000 -0500 -+++ gdb-6.3/gdb/valops.c 2005-03-24 19:08:31.000000000 -0500 -@@ -1,6 +1,6 @@ - /* Perform non-arithmetic operations on values, for GDB. - Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, -- 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -+ 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This file is part of GDB. -@@ -2315,8 +2315,13 @@ check_field_in (struct type *type, const +Index: gdb-6.5/gdb/valops.c +=================================================================== +--- gdb-6.5.orig/gdb/valops.c 2005-12-17 20:34:03.000000000 -0200 ++++ gdb-6.5/gdb/valops.c 2006-07-07 02:35:09.000000000 -0300 +@@ -2257,8 +2257,13 @@ check_field_in (struct type *type, const } for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--) - if (check_field_in (TYPE_BASECLASS (type, i), name)) - return 1; + { -+ /* Check the base classes. Make sure we have the real type for ++ /* Check the base classes. Make sure we have the real type for + each base class as opposed to an opaque declaration. */ + struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i)); + if (check_field_in (baseclass, name)) diff --git a/gdb-6.3-large-core-20051206.patch b/gdb-6.3-large-core-20051206.patch index 8a29492..7e349d3 100644 --- a/gdb-6.3-large-core-20051206.patch +++ b/gdb-6.3-large-core-20051206.patch @@ -21,66 +21,61 @@ * remote.h: Ditto. * dcache.h: Ditto. ---- gdb-6.3/gdb/symfile-mem.c.fix 2005-12-14 17:57:05.000000000 -0500 -+++ gdb-6.3/gdb/symfile-mem.c 2005-12-14 18:10:19.000000000 -0500 -@@ -57,6 +57,14 @@ +Index: gdb-6.5/gdb/symfile-mem.c +=================================================================== +--- gdb-6.5.orig/gdb/symfile-mem.c 2006-07-11 02:35:34.000000000 -0300 ++++ gdb-6.5/gdb/symfile-mem.c 2006-07-11 02:35:49.000000000 -0300 +@@ -58,6 +58,14 @@ #include "elf/common.h" +/* Local callback routine to pass to bfd to read from target memory, + using a len constrained to INT_MAX. */ +static int -+read_target_memory (CORE_ADDR addr, char *buf, int len) ++read_target_memory (bfd_vma addr, bfd_byte *buf, int len) +{ + return target_read_memory (addr, buf, (LONGEST)len); +} + /* Read inferior memory at ADDR to find the header of a loaded object file and read its in-core symbols out of inferior memory. TEMPL is a bfd - representing the target's format. */ -@@ -74,7 +82,7 @@ symbol_file_add_from_memory (struct bfd - error ("add-symbol-file-from-memory not supported for this target"); + representing the target's format. NAME is the name to use for this +@@ -78,7 +86,7 @@ symbol_file_add_from_memory (struct bfd + error (_("add-symbol-file-from-memory not supported for this target")); nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, &loadbase, - target_read_memory); + read_target_memory); if (nbfd == NULL) - error ("Failed to read a valid object file image from memory."); + error (_("Failed to read a valid object file image from memory.")); ---- gdb-6.3/gdb/target.c.fix 2005-12-06 16:16:29.000000000 -0500 -+++ gdb-6.3/gdb/target.c 2005-12-14 18:16:06.000000000 -0500 -@@ -82,7 +82,7 @@ static LONGEST default_xfer_partial (str +Index: gdb-6.5/gdb/target.c +=================================================================== +--- gdb-6.5.orig/gdb/target.c 2006-07-11 02:35:49.000000000 -0300 ++++ gdb-6.5/gdb/target.c 2006-07-11 02:35:49.000000000 -0300 +@@ -83,8 +83,8 @@ static LONGEST default_xfer_partial (str partial transfers, try either target_read_memory_partial or target_write_memory_partial). */ --static int target_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, -+static int target_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, - int write); +-static int target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, +- int write); ++static int target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ++ LONGEST len, int write); static void init_dummy_target (void); -@@ -109,9 +109,9 @@ static void debug_to_store_registers (in - static void debug_to_prepare_to_store (void); - --static int deprecated_debug_xfer_memory (CORE_ADDR, char *, int, int, -- struct mem_attrib *, -- struct target_ops *); -+static LONGEST deprecated_debug_xfer_memory (CORE_ADDR, char *, LONGEST, int, -+ struct mem_attrib *, -+ struct target_ops *); - - static void debug_to_files_info (struct target_ops *); - -@@ -514,7 +514,7 @@ update_current_target (void) +@@ -511,8 +511,8 @@ update_current_target (void) + de_fault (to_prepare_to_store, (void (*) (void)) noprocess); - de_fault (deprecated_xfer_memory, -- (int (*) (CORE_ADDR, char *, int, int, struct mem_attrib *, struct target_ops *)) -+ (LONGEST (*) (CORE_ADDR, char *, LONGEST, int, struct mem_attrib *, struct target_ops *)) +- de_fault (deprecated_xfer_memory, +- (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) ++ de_fault (deprecated_xfer_memory, ++ (LONGEST (*) (CORE_ADDR, gdb_byte *, LONGEST, int, struct mem_attrib *, struct target_ops *)) nomemory); de_fault (to_files_info, (void (*) (struct target_ops *)) -@@ -945,7 +945,7 @@ target_xfer_partial (struct target_ops * +@@ -940,7 +940,7 @@ target_xfer_partial (struct target_ops * implementing another singluar mechanism (for instance, a generic object:annex onto inferior:object:annex say). */ @@ -89,32 +84,32 @@ xfer_using_stratum (enum target_object object, const char *annex, ULONGEST offset, LONGEST len, void *readbuf, const void *writebuf) -@@ -1010,7 +1010,7 @@ xfer_using_stratum (enum target_object o +@@ -1005,7 +1005,7 @@ xfer_using_stratum (enum target_object o deal with partial reads should call target_read_memory_partial. */ int --target_read_memory (CORE_ADDR memaddr, char *myaddr, int len) -+target_read_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len) +-target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len) ++target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len) { if (target_xfer_partial_p ()) return xfer_using_stratum (TARGET_OBJECT_MEMORY, NULL, -@@ -1020,7 +1020,7 @@ target_read_memory (CORE_ADDR memaddr, c +@@ -1015,7 +1015,7 @@ target_read_memory (CORE_ADDR memaddr, g } int --target_write_memory (CORE_ADDR memaddr, char *myaddr, int len) -+target_write_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len) +-target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len) ++target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, LONGEST len) { - if (target_xfer_partial_p ()) - return xfer_using_stratum (TARGET_OBJECT_MEMORY, NULL, -@@ -1051,11 +1051,11 @@ static int trust_readonly = 0; + gdb_byte *bytes = alloca (len); + memcpy (bytes, myaddr, len); +@@ -1056,11 +1056,11 @@ Mode for reading from readonly sections Result is -1 on error, or the number of bytes transfered. */ -int --do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, +-do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write, +LONGEST -+do_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write, ++do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write, struct mem_attrib *attrib) { - int res; @@ -122,12 +117,13 @@ int done = 0; struct target_ops *t; -@@ -1113,10 +1113,10 @@ do_xfer_memory (CORE_ADDR memaddr, char +@@ -1118,10 +1118,11 @@ do_xfer_memory (CORE_ADDR memaddr, gdb_b Result is 0 or errno value. */ static int --target_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write) -+target_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write) +-target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write) ++target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ++ LONGEST len, int write) { - int res; - int reg_len; @@ -136,14 +132,14 @@ struct mem_region *region; /* Zero length requests are ok and require no work. */ -@@ -1186,12 +1186,12 @@ target_xfer_memory (CORE_ADDR memaddr, c - - Result is -1 on error, or the number of bytes transfered. */ +@@ -1192,12 +1193,12 @@ target_xfer_memory (CORE_ADDR memaddr, g + If we succeed, set *ERR to zero and return the number of bytes transferred. + If we fail, set *ERR to a non-zero errno value, and return -1. */ -static int --target_xfer_memory_partial (CORE_ADDR memaddr, char *myaddr, int len, +-target_xfer_memory_partial (CORE_ADDR memaddr, gdb_byte *myaddr, int len, +static LONGEST -+target_xfer_memory_partial (CORE_ADDR memaddr, char *myaddr, LONGEST len, ++target_xfer_memory_partial (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write_p, int *err) { - int res; @@ -153,41 +149,42 @@ struct mem_region *region; /* Zero length requests are ok and require no work. */ -@@ -1250,8 +1250,8 @@ target_xfer_memory_partial (CORE_ADDR me +@@ -1256,9 +1257,9 @@ target_xfer_memory_partial (CORE_ADDR me return res; } -int --target_read_memory_partial (CORE_ADDR memaddr, char *buf, int len, int *err) +LONGEST -+target_read_memory_partial (CORE_ADDR memaddr, char *buf, LONGEST len, int *err) + target_read_memory_partial (CORE_ADDR memaddr, gdb_byte *buf, +- int len, int *err) ++ LONGEST len, int *err) { if (target_xfer_partial_p ()) - return target_xfer_partial (target_stack, TARGET_OBJECT_MEMORY, NULL, -@@ -1260,8 +1260,9 @@ target_read_memory_partial (CORE_ADDR me + { +@@ -1285,9 +1286,9 @@ target_read_memory_partial (CORE_ADDR me return target_xfer_memory_partial (memaddr, buf, len, 0, err); } -int --target_write_memory_partial (CORE_ADDR memaddr, char *buf, int len, int *err) +LONGEST -+target_write_memory_partial (CORE_ADDR memaddr, char *buf, LONGEST len, -+ int *err) + target_write_memory_partial (CORE_ADDR memaddr, gdb_byte *buf, +- int len, int *err) ++ LONGEST len, int *err) { if (target_xfer_partial_p ()) - return target_xfer_partial (target_stack, TARGET_OBJECT_MEMORY, NULL, -@@ -1985,8 +1986,8 @@ debug_to_prepare_to_store (void) + { +@@ -2044,8 +2045,8 @@ debug_to_prepare_to_store (void) fprintf_unfiltered (gdb_stdlog, "target_prepare_to_store ()\n"); } -static int --deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, +-deprecated_debug_xfer_memory (CORE_ADDR memaddr, bfd_byte *myaddr, int len, +static LONGEST -+deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, ++deprecated_debug_xfer_memory (CORE_ADDR memaddr, bfd_byte *myaddr, LONGEST len, int write, struct mem_attrib *attrib, struct target_ops *target) { -@@ -1996,9 +1997,9 @@ deprecated_debug_xfer_memory (CORE_ADDR +@@ -2055,9 +2056,9 @@ deprecated_debug_xfer_memory (CORE_ADDR attrib, target); fprintf_unfiltered (gdb_stdlog, @@ -199,74 +196,85 @@ if (retval > 0) { ---- gdb-6.3/gdb/target.h.fix 2005-12-06 16:16:33.000000000 -0500 -+++ gdb-6.3/gdb/target.h 2005-12-14 17:56:47.000000000 -0500 -@@ -330,8 +330,8 @@ struct target_ops +Index: gdb-6.5/gdb/target.h +=================================================================== +--- gdb-6.5.orig/gdb/target.h 2006-07-11 02:35:48.000000000 -0300 ++++ gdb-6.5/gdb/target.h 2006-07-11 02:35:49.000000000 -0300 +@@ -332,10 +332,10 @@ struct target_ops NOTE: cagney/2004-10-01: This has been entirely superseeded by to_xfer_partial and inferior inheritance. */ -- int (*deprecated_xfer_memory) (CORE_ADDR memaddr, char *myaddr, +- int (*deprecated_xfer_memory) (CORE_ADDR memaddr, gdb_byte *myaddr, - int len, int write, -+ LONGEST (*deprecated_xfer_memory) (CORE_ADDR memaddr, char *myaddr, -+ LONGEST len, int write, - struct mem_attrib *attrib, - struct target_ops *target); +- struct mem_attrib *attrib, +- struct target_ops *target); ++ LONGEST (*deprecated_xfer_memory) (CORE_ADDR memaddr, gdb_byte *myaddr, ++ LONGEST len, int write, ++ struct mem_attrib *attrib, ++ struct target_ops *target); -@@ -533,20 +533,20 @@ extern void target_disconnect (char *, i + void (*to_files_info) (struct target_ops *); + int (*to_insert_breakpoint) (struct bp_target_info *); +@@ -535,21 +535,23 @@ extern void target_disconnect (char *, i extern DCACHE *target_dcache; --extern int do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, -- struct mem_attrib *attrib); -+extern LONGEST do_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, -+ int write, struct mem_attrib *attrib); +-extern int do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, +- int write, struct mem_attrib *attrib); ++extern LONGEST do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ++ LONGEST len, int write, ++ struct mem_attrib *attrib); extern int target_read_string (CORE_ADDR, char **, int, int *); --extern int target_read_memory (CORE_ADDR memaddr, char *myaddr, int len); -+extern int target_read_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len); +-extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len); ++extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ++ LONGEST len); --extern int target_write_memory (CORE_ADDR memaddr, char *myaddr, int len); -+extern int target_write_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len); + extern int target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, +- int len); ++ LONGEST len); --extern int xfer_memory (CORE_ADDR, char *, int, int, +-extern int xfer_memory (CORE_ADDR, gdb_byte *, int, int, - struct mem_attrib *, struct target_ops *); -+extern LONGEST xfer_memory (CORE_ADDR, char *, LONGEST, int, ++extern LONGEST xfer_memory (CORE_ADDR, gdb_byte *, LONGEST, int, + struct mem_attrib *, struct target_ops *); --extern int child_xfer_memory (CORE_ADDR, char *, int, int, +-extern int child_xfer_memory (CORE_ADDR, gdb_byte *, int, int, - struct mem_attrib *, struct target_ops *); -+extern LONGEST child_xfer_memory (CORE_ADDR, char *, LONGEST, int, -+ struct mem_attrib *, struct target_ops *); ++extern LONGEST child_xfer_memory (CORE_ADDR, gdb_byte *, LONGEST, int, ++ struct mem_attrib *, struct target_ops *); /* Make a single attempt at transfering LEN bytes. On a successful transfer, the number of bytes actually transfered is returned and -@@ -554,11 +554,11 @@ extern int child_xfer_memory (CORE_ADDR, +@@ -557,11 +559,11 @@ extern int child_xfer_memory (CORE_ADDR, of bytes actually transfered is not defined) and ERR is set to a non-zero error indication. */ --extern int target_read_memory_partial (CORE_ADDR addr, char *buf, int len, -- int *err); -+extern LONGEST target_read_memory_partial (CORE_ADDR addr, char *buf, LONGEST len, -+ int *err); +-extern int target_read_memory_partial (CORE_ADDR addr, gdb_byte *buf, +- int len, int *err); ++extern LONGEST target_read_memory_partial (CORE_ADDR addr, gdb_byte *buf, ++ LONGEST len, int *err); --extern int target_write_memory_partial (CORE_ADDR addr, char *buf, int len, -- int *err); -+extern LONGEST target_write_memory_partial (CORE_ADDR addr, char *buf, LONGEST len, -+ int *err); +-extern int target_write_memory_partial (CORE_ADDR addr, gdb_byte *buf, +- int len, int *err); ++extern LONGEST target_write_memory_partial (CORE_ADDR addr, gdb_byte *buf, ++ LONGEST len, int *err); extern char *child_pid_to_exec_file (int); ---- gdb-6.3/gdb/infptrace.c.fix 2005-12-06 16:16:38.000000000 -0500 -+++ gdb-6.3/gdb/infptrace.c 2005-12-14 14:22:10.000000000 -0500 -@@ -443,17 +443,17 @@ store_inferior_registers (int regnum) +Index: gdb-6.5/gdb/infptrace.c +=================================================================== +--- gdb-6.5.orig/gdb/infptrace.c 2006-07-11 02:35:49.000000000 -0300 ++++ gdb-6.5/gdb/infptrace.c 2006-07-11 02:35:49.000000000 -0300 +@@ -368,17 +368,17 @@ store_inferior_registers (int regnum) deprecated_child_ops doesn't allow memory operations to cross below us in the target stack anyway. */ -int --child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, +-child_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write, +LONGEST -+child_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write, ++child_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write, struct mem_attrib *attrib, struct target_ops *target) { - int i; @@ -275,109 +283,76 @@ CORE_ADDR addr = memaddr & -(CORE_ADDR) sizeof (PTRACE_TYPE_RET); /* Round ending address up; get number of longwords that makes. */ - int count = ((((memaddr + len) - addr) + sizeof (PTRACE_TYPE_RET) - 1) -+ LONGEST count = ((((memaddr + len) - addr) + sizeof (PTRACE_TYPE_RET) - 1) - / sizeof (PTRACE_TYPE_RET)); +- / sizeof (PTRACE_TYPE_RET)); - int alloc = count * sizeof (PTRACE_TYPE_RET); ++ LONGEST count = ((((memaddr + len) - addr) + sizeof (PTRACE_TYPE_RET) - 1) ++ / sizeof (PTRACE_TYPE_RET)); + LONGEST alloc = count * sizeof (PTRACE_TYPE_RET); PTRACE_TYPE_RET *buffer; struct cleanup *old_chain = NULL; ---- gdb-6.3/gdb/dcache.c.fix 2005-12-06 16:16:44.000000000 -0500 -+++ gdb-6.3/gdb/dcache.c 2005-12-14 15:18:22.000000000 -0500 -@@ -524,9 +524,9 @@ dcache_free (DCACHE *dcache) +Index: gdb-6.5/gdb/dcache.c +=================================================================== +--- gdb-6.5.orig/gdb/dcache.c 2006-07-11 02:35:34.000000000 -0300 ++++ gdb-6.5/gdb/dcache.c 2006-07-11 02:35:49.000000000 -0300 +@@ -527,9 +527,9 @@ dcache_free (DCACHE *dcache) This routine is indended to be called by remote_xfer_ functions. */ -int --dcache_xfer_memory (DCACHE *dcache, CORE_ADDR memaddr, char *myaddr, int len, -- int should_write) +LONGEST -+dcache_xfer_memory (DCACHE *dcache, CORE_ADDR memaddr, char *myaddr, + dcache_xfer_memory (DCACHE *dcache, CORE_ADDR memaddr, gdb_byte *myaddr, +- int len, int should_write) + LONGEST len, int should_write) { int i; - int (*xfunc) (DCACHE *dcache, CORE_ADDR addr, char *ptr); ---- gdb-6.3/gdb/dcache.h.fix 2005-12-06 16:16:50.000000000 -0500 -+++ gdb-6.3/gdb/dcache.h 2005-12-14 15:18:47.000000000 -0500 + int (*xfunc) (DCACHE *dcache, CORE_ADDR addr, gdb_byte *ptr); +Index: gdb-6.5/gdb/dcache.h +=================================================================== +--- gdb-6.5.orig/gdb/dcache.h 2006-07-11 02:35:34.000000000 -0300 ++++ gdb-6.5/gdb/dcache.h 2006-07-11 02:35:49.000000000 -0300 @@ -37,7 +37,7 @@ void dcache_free (DCACHE *); /* Simple to call from _xfer_memory */ --int dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, char *my, int len, -- int should_write); -+LONGEST dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, char *my, LONGEST len, -+ int should_write); +-int dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, gdb_byte *my, +- int len, int should_write); ++LONGEST dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, gdb_byte *my, ++ LONGEST len, int should_write); #endif /* DCACHE_H */ ---- gdb-6.3/gdb/exec.c.fix 2005-12-06 16:16:56.000000000 -0500 -+++ gdb-6.3/gdb/exec.c 2005-12-14 15:06:30.000000000 -0500 -@@ -444,8 +444,8 @@ map_vmap (bfd *abfd, bfd *arch) +Index: gdb-6.5/gdb/exec.c +=================================================================== +--- gdb-6.5.orig/gdb/exec.c 2006-07-11 02:35:34.000000000 -0300 ++++ gdb-6.5/gdb/exec.c 2006-07-11 02:35:49.000000000 -0300 +@@ -447,8 +447,8 @@ map_vmap (bfd *abfd, bfd *arch) The same routine is used to handle both core and exec files; we just tail-call it with more arguments to select between them. */ -int --xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, +-xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write, +LONGEST -+xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write, - struct mem_attrib *attrib, - struct target_ops *target) ++xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write, + struct mem_attrib *attrib, struct target_ops *target) { ---- gdb-6.3/gdb/linux-nat.c.fix 2005-12-06 16:17:02.000000000 -0500 -+++ gdb-6.3/gdb/linux-nat.c 2005-12-14 14:26:41.000000000 -0500 -@@ -2444,12 +2444,12 @@ linux_nat_mourn_inferior (void) - #ifdef NATIVE_XFER_UNWIND_TABLE - extern int ia64_linux_check_stack_region(struct lwp_info *lwp, void *range); - #endif --static int --linux_nat_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, -+static LONGEST -+linux_nat_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write, - struct mem_attrib *attrib, struct target_ops *target) - { - struct cleanup *old_chain = save_inferior_ptid (); -- int xfer; -+ LONGEST xfer; + int res; +Index: gdb-6.5/gdb/linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/linux-nat.c 2006-07-11 02:35:49.000000000 -0300 ++++ gdb-6.5/gdb/linux-nat.c 2006-07-11 02:36:39.000000000 -0300 +@@ -3264,7 +3264,7 @@ linux_xfer_partial (struct target_ops *o + Revert when Bugzilla 147436 is fixed. */ + if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL) + { /* This region contains ia64 rse registers, we have to re-read. */ +- int xxfer; ++ LONGEST xxfer; - #ifdef NATIVE_XFER_UNWIND_TABLE - struct mem_region range; -@@ -2467,7 +2467,7 @@ linux_nat_xfer_memory (CORE_ADDR memaddr - xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target); - else if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL) - { /* This region contains ia64 rse registers, we have to re-read. */ -- int xxfer; -+ LONGEST xxfer; - /* Re-read register stack area. */ - xxfer = child_xfer_memory (range.lo, myaddr + (range.lo - memaddr), - range.hi - range.lo, write, attrib, target); -@@ -3091,8 +3091,8 @@ linux_nat_info_proc_cmd (char *args, int - } - } - --int --linux_proc_xfer_memory (CORE_ADDR addr, char *myaddr, int len, int write, -+LONGEST -+linux_proc_xfer_memory (CORE_ADDR addr, char *myaddr, LONGEST len, int write, - struct mem_attrib *attrib, struct target_ops *target) - { - int fd, ret; ---- gdb-6.3/gdb/linux-nat.h.fix 2005-12-06 16:17:07.000000000 -0500 -+++ gdb-6.3/gdb/linux-nat.h 2005-12-14 14:27:44.000000000 -0500 -@@ -80,9 +80,10 @@ struct linux_watchpoint - struct mem_attrib; - struct target_ops; - --extern int linux_proc_xfer_memory (CORE_ADDR addr, char *myaddr, int len, -- int write, struct mem_attrib *attrib, -- struct target_ops *target); -+extern LONGEST linux_proc_xfer_memory (CORE_ADDR addr, char *myaddr, -+ LONGEST len, -+ int write, struct mem_attrib *attrib, -+ struct target_ops *target); - - /* Find process PID's pending signal set from /proc/pid/status. */ - void linux_proc_pending_signals (int pid, sigset_t *pending, sigset_t *blocked, sigset_t *ignored); ---- gdb-6.3/gdb/remote.c.fix 2005-12-06 16:17:17.000000000 -0500 -+++ gdb-6.3/gdb/remote.c 2005-12-14 15:14:39.000000000 -0500 + /* Re-read register stack area. */ + xxfer = super_xfer_partial (ops, object, annex, +Index: gdb-6.5/gdb/remote.c +=================================================================== +--- gdb-6.5.orig/gdb/remote.c 2006-07-11 02:35:48.000000000 -0300 ++++ gdb-6.5/gdb/remote.c 2006-07-11 02:37:02.000000000 -0300 @@ -27,6 +27,7 @@ #include "gdb_string.h" #include @@ -386,29 +361,14 @@ #include "inferior.h" #include "bfd.h" #include "symfile.h" -@@ -69,10 +70,10 @@ static void build_remote_gdbarch_data (v - - static void remote_files_info (struct target_ops *ignore); - --static int remote_xfer_memory (CORE_ADDR memaddr, char *myaddr, -- int len, int should_write, -- struct mem_attrib *attrib, -- struct target_ops *target); -+static LONGEST remote_xfer_memory (CORE_ADDR memaddr, char *myaddr, -+ LONGEST len, int should_write, -+ struct mem_attrib *attrib, -+ struct target_ops *target); - - static void remote_prepare_to_store (void); - -@@ -3791,18 +3792,25 @@ remote_read_bytes (CORE_ADDR memaddr, ch - SHOULD_WRITE is nonzero. Returns length of data written or read; 0 - for error. TARGET is unused. */ +@@ -3701,19 +3702,27 @@ remote_read_bytes (CORE_ADDR memaddr, gd + if SHOULD_WRITE is nonzero. Returns length of data written or + read; 0 for error. TARGET is unused. */ -static int --remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, int mem_len, +-remote_xfer_memory (CORE_ADDR mem_addr, gdb_byte *buffer, int mem_len, +static LONGEST -+remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, LONGEST mem_len, ++remote_xfer_memory (CORE_ADDR mem_addr, gdb_byte *buffer, LONGEST mem_len, int should_write, struct mem_attrib *attrib, struct target_ops *target) { @@ -417,6 +377,7 @@ int res; + int len; + ++ + /* This routine is not set up to handle > INT_MAX bytes. */ + if (mem_len >= (LONGEST)INT_MAX) + return 0; @@ -424,13 +385,14 @@ + len = (int)mem_len; /* Should this be the selected frame? */ - gdbarch_remote_translate_xfer_address (current_gdbarch, current_regcache, + gdbarch_remote_translate_xfer_address (current_gdbarch, + current_regcache, - mem_addr, mem_len, + mem_addr, len, &targ_addr, &targ_len); if (targ_len <= 0) return 0; -@@ -3812,7 +3820,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, +@@ -3723,7 +3732,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, else res = remote_read_bytes (targ_addr, buffer, targ_len); @@ -439,49 +401,18 @@ } static void ---- gdb-6.3/gdb/thread-db.c.fix 2005-12-06 16:17:22.000000000 -0500 -+++ gdb-6.3/gdb/thread-db.c 2005-12-14 14:42:28.000000000 -0500 -@@ -955,12 +955,12 @@ thread_db_wait (ptid_t ptid, struct targ - return ptid; - } - --static int --thread_db_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, -+static LONGEST -+thread_db_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write, - struct mem_attrib *attrib, struct target_ops *target) - { - struct cleanup *old_chain = save_inferior_ptid (); -- int xfer; -+ LONGEST xfer; - - if (is_thread (inferior_ptid)) - { ---- gdb-6.3/gdb/remote-sim.c.fix 2005-12-07 16:02:02.000000000 -0500 -+++ gdb-6.3/gdb/remote-sim.c 2005-12-14 15:15:53.000000000 -0500 -@@ -93,10 +93,10 @@ static ptid_t gdbsim_wait (ptid_t ptid, - - static void gdbsim_prepare_to_store (void); - --static int gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, -- int len, int write, -- struct mem_attrib *attrib, -- struct target_ops *target); -+static LONGEST gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, -+ LONGEST len, int write, -+ struct mem_attrib *attrib, -+ struct target_ops *target); - - static void gdbsim_files_info (struct target_ops *target); - -@@ -741,11 +741,14 @@ gdbsim_prepare_to_store (void) +Index: gdb-6.5/gdb/remote-sim.c +=================================================================== +--- gdb-6.5.orig/gdb/remote-sim.c 2006-07-11 02:35:34.000000000 -0300 ++++ gdb-6.5/gdb/remote-sim.c 2006-07-11 02:35:49.000000000 -0300 +@@ -742,11 +742,14 @@ gdbsim_prepare_to_store (void) Returns the number of bytes transferred. */ -static int --gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len, +-gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, +static LONGEST -+gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, ++gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write, struct mem_attrib *attrib, struct target_ops *target) { @@ -489,9 +420,9 @@ + int xfer_len = (int)len; + if (!program_loaded) - error ("No program loaded."); + error (_("No program loaded.")); -@@ -755,22 +758,22 @@ gdbsim_xfer_inferior_memory (CORE_ADDR m +@@ -756,22 +759,22 @@ gdbsim_xfer_inferior_memory (CORE_ADDR m printf_filtered ("gdbsim_xfer_inferior_memory: myaddr 0x"); gdb_print_host_address (myaddr, gdb_stdout); printf_filtered (", memaddr 0x%s, len %d, write %d\n", diff --git a/gdb-6.3-linespec-20041213.patch b/gdb-6.3-linespec-20041213.patch index 9cf38e6..f873f29 100644 --- a/gdb-6.3-linespec-20041213.patch +++ b/gdb-6.3-linespec-20041213.patch @@ -1,6 +1,8 @@ ---- gdb-6.3/gdb/linespec.c.fix Mon Dec 13 19:55:27 2004 -+++ gdb-6.3/gdb/linespec.c Mon Dec 13 19:59:05 2004 -@@ -73,7 +73,8 @@ static struct symtabs_and_lines find_met +Index: gdb-6.5/gdb/linespec.c +=================================================================== +--- gdb-6.5.orig/gdb/linespec.c 2006-01-10 20:14:43.000000000 -0200 ++++ gdb-6.5/gdb/linespec.c 2006-07-07 01:04:56.000000000 -0300 +@@ -75,7 +75,8 @@ static struct symtabs_and_lines find_met struct symbol *sym_class); static int collect_methods (char *copy, struct type *t, @@ -10,7 +12,7 @@ static NORETURN void cplusplus_error (const char *name, const char *fmt, ...) -@@ -81,10 +82,12 @@ static NORETURN void cplusplus_error (co +@@ -83,10 +84,12 @@ static NORETURN void cplusplus_error (co static int total_number_of_methods (struct type *type); @@ -25,7 +27,7 @@ static int add_constructors (int method_counter, struct type *t, struct symbol **sym_arr); -@@ -99,6 +102,9 @@ static int is_objc_method_format (const +@@ -101,6 +104,9 @@ static int is_objc_method_format (const static struct symtabs_and_lines decode_line_2 (struct symbol *[], int, int, char ***); @@ -35,7 +37,7 @@ static struct symtab *symtab_from_filename (char **argptr, char *p, int is_quote_enclosed, int *not_found_ptr); -@@ -189,12 +195,18 @@ total_number_of_methods (struct type *ty +@@ -191,12 +197,18 @@ total_number_of_methods (struct type *ty /* Recursive helper function for decode_line_1. Look for methods named NAME in type T. Return number of matches. @@ -56,7 +58,7 @@ { int i1 = 0; int ibase; -@@ -237,7 +249,8 @@ find_methods (struct type *t, char *name +@@ -239,7 +251,8 @@ find_methods (struct type *t, char *name if (strcmp_iw (name, method_name) == 0) /* Find all the overloaded methods with that name. */ i1 += add_matching_methods (method_counter, t, @@ -66,7 +68,7 @@ else if (strncmp (class_name, name, name_len) == 0 && (class_name[name_len] == '\0' || class_name[name_len] == '<')) -@@ -259,21 +272,83 @@ find_methods (struct type *t, char *name +@@ -261,21 +274,83 @@ find_methods (struct type *t, char *name if (i1 == 0) for (ibase = 0; ibase < TYPE_N_BASECLASSES (t); ibase++) @@ -78,8 +80,8 @@ } +static int -+add_minsym_members (const char *class_name, -+ const char *member_name, ++add_minsym_members (const char *class_name, ++ const char *member_name, + struct minimal_symbol **msym_arr) +{ + char *completion_name; @@ -129,7 +131,7 @@ + ++counter; + } + xfree (list); -+ xfree (completion_name); ++ xfree (completion_name); + + return counter; +} @@ -152,7 +154,7 @@ for (field_counter = TYPE_FN_FIELDLIST_LENGTH (t, method_counter) - 1; field_counter >= 0; -@@ -297,6 +372,16 @@ add_matching_methods (int method_counter +@@ -299,6 +374,16 @@ add_matching_methods (int method_counter } else phys_name = TYPE_FN_FIELD_PHYSNAME (f, field_counter); @@ -162,14 +164,14 @@ + when we have in-charge and not-in-charge constructors. + Since we don't have a mangled name to work with, if we + look for the symbol, we can only find the class itself. -+ We can find the information we need in the minimal symbol ++ We can find the information we need in the minimal symbol + table which has the full member name information we need. */ + if (strlen (phys_name) <= strlen (class_name)) + return add_minsym_members (class_name, phys_name, msym_arr); /* Destructor is handled by caller, don't add it to the list. */ -@@ -322,6 +407,9 @@ add_matching_methods (int method_counter +@@ -324,6 +409,9 @@ add_matching_methods (int method_counter } } @@ -179,7 +181,7 @@ return i1; } -@@ -601,6 +689,146 @@ decode_line_2 (struct symbol *sym_arr[], +@@ -603,6 +691,146 @@ decode_line_2 (struct symbol *sym_arr[], discard_cleanups (old_chain); return return_values; } @@ -224,9 +226,9 @@ + init_sal (&values.sals[i]); + if (msym_arr[i]) + { -+ struct symtabs_and_lines msal = minsym_found (funfirstline, ++ struct symtabs_and_lines msal = minsym_found (funfirstline, + msym_arr[i]); -+ memcpy (&values.sals[i], &msal.sals[0], ++ memcpy (&values.sals[i], &msal.sals[0], + sizeof (struct symtab_and_line)); + if (values.sals[i].symtab) + printf_unfiltered ("[%d] %s at %s:%d\n", @@ -326,7 +328,7 @@ /* The parser of linespec itself. */ -@@ -1404,35 +1632,46 @@ find_method (int funfirstline, char ***c +@@ -1406,36 +1634,46 @@ find_method (int funfirstline, char ***c int i1; /* Counter for the symbol array. */ struct symbol **sym_arr = alloca (total_number_of_methods (t) * sizeof (struct symbol *)); @@ -358,6 +360,7 @@ + return minsym_found (funfirstline, msym_arr[0]); else { +- values.sals = NULL; - values.nelts = 0; + sym = sym_arr[0]; + @@ -386,7 +389,7 @@ return decode_line_2 (sym_arr, i1, funfirstline, canonical); } else -@@ -1459,11 +1698,12 @@ find_method (int funfirstline, char ***c +@@ -1462,11 +1700,12 @@ find_method (int funfirstline, char ***c } /* Find all methods named COPY in the class whose type is T, and put @@ -401,7 +404,7 @@ { int i1 = 0; /* Counter for the symbol array. */ -@@ -1485,7 +1725,7 @@ collect_methods (char *copy, struct type +@@ -1488,7 +1727,7 @@ collect_methods (char *copy, struct type } } else diff --git a/gdb-6.3-lwp-cache-20041216.patch b/gdb-6.3-lwp-cache-20041216.patch index 1308550..7bca108 100644 --- a/gdb-6.3-lwp-cache-20041216.patch +++ b/gdb-6.3-lwp-cache-20041216.patch @@ -1,11 +1,11 @@ 2004-12-16 Jeff Johnston - * thread-db.c (clear_lwp_callback): Removed. + * linux-thread-db.c (clear_lwpip_callback): Removed. (thread_db_resume): Do not iterate and call clear_lwp_callback. ---- gdb-6.3/gdb/thread-db.c.fix Thu Dec 16 16:32:13 2004 -+++ gdb-6.3/gdb/thread-db.c Thu Dec 16 16:32:30 2004 +--- gdb-6.3/gdb/linux-thread-db.c.fix Thu Dec 16 16:32:13 2004 ++++ gdb-6.3/gdb/linux-thread-db.c Thu Dec 16 16:32:30 2004 @@ -822,19 +822,6 @@ thread_db_detach (char *args, int from_t target_beneath->to_detach (args, from_tty); } diff --git a/gdb-6.3-nonthreaded-wp-20050117.patch b/gdb-6.3-nonthreaded-wp-20050117.patch index d5e01a7..5b4b3f3 100644 --- a/gdb-6.3-nonthreaded-wp-20050117.patch +++ b/gdb-6.3-nonthreaded-wp-20050117.patch @@ -1,7 +1,9 @@ ---- gdb-6.3/gdb/doc/observer.texi.fix Tue Jan 18 16:51:56 2005 -+++ gdb-6.3/gdb/doc/observer.texi Tue Jan 18 17:38:57 2005 -@@ -91,6 +91,10 @@ at the entry-point instruction. For @sa - inferior, and before any information on the inferior has been printed. +Index: gdb-6.5/gdb/doc/observer.texi +=================================================================== +--- gdb-6.5.orig/gdb/doc/observer.texi 2006-07-07 04:08:37.000000000 -0300 ++++ gdb-6.5/gdb/doc/observer.texi 2006-07-07 04:19:00.000000000 -0300 +@@ -119,6 +119,10 @@ when @value{GDBN} calls this observer, t + haven't been loaded yet. @end deftypefun +@deftypefun void mourn_inferior (struct target_ops *@var{target}) @@ -9,18 +11,12 @@ +@end deftypefun + @deftypefun void solib_unloaded (struct so_list *@var{solib}) - The specified shared library has been discovered to be unloaded. + The shared library specified by @var{solib} has been unloaded. @end deftypefun ---- gdb-6.3/gdb/linux-nat.c.fix Tue Jan 18 16:52:24 2005 -+++ gdb-6.3/gdb/linux-nat.c Tue Jan 18 17:14:01 2005 -@@ -1,6 +1,6 @@ - /* GNU/Linux native-dependent code common to multiple platforms. - -- Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+ Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - - This file is part of GDB. - +Index: gdb-6.5/gdb/linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/linux-nat.c 2006-07-07 04:00:05.000000000 -0300 ++++ gdb-6.5/gdb/linux-nat.c 2006-07-07 04:20:40.000000000 -0300 @@ -802,11 +802,23 @@ iterate_over_lwps (int (*callback) (stru { struct lwp_info *lp, *lpnext; @@ -48,8 +44,8 @@ } return NULL; -@@ -3103,6 +3115,18 @@ linux_proc_pending_signals (int pid, sig - fclose (procfile); +@@ -3262,6 +3274,18 @@ linux_nat_add_target (struct target_ops + thread_db_init (t); } +/* Observer function for a mourn inferior event. This is needed @@ -67,29 +63,20 @@ void _initialize_linux_nat (void) { -@@ -3120,7 +3144,9 @@ Specify any of the following keywords fo - stat -- list a bunch of random process info.\n\ +@@ -3276,6 +3300,8 @@ Specify any of the following keywords fo status -- list a different bunch of random process info.\n\ - all -- list all available /proc info."); -- -+ + all -- list all available /proc info.")); + + observer_attach_mourn_inferior (linux_nat_mourn_inferior_observer); -+ - init_linux_nat_ops (); - add_target (&linux_nat_ops); - thread_db_init (&linux_nat_ops); ---- gdb-6.3/gdb/target.c.fix Tue Jan 18 17:02:37 2005 -+++ gdb-6.3/gdb/target.c Tue Jan 18 17:39:43 2005 -@@ -1,7 +1,7 @@ - /* Select target systems and architectures at runtime for GDB. ++ + /* Save the original signal mask. */ + sigprocmask (SIG_SETMASK, NULL, &normal_mask); - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -- 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+ 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - - Contributed by Cygnus Support. - -@@ -38,6 +38,7 @@ +Index: gdb-6.5/gdb/target.c +=================================================================== +--- gdb-6.5.orig/gdb/target.c 2006-07-07 03:52:38.000000000 -0300 ++++ gdb-6.5/gdb/target.c 2006-07-07 04:19:00.000000000 -0300 +@@ -39,6 +39,7 @@ #include "regcache.h" #include "gdb_assert.h" #include "gdbcore.h" @@ -97,7 +84,7 @@ static void target_info (char *, int); -@@ -266,6 +267,13 @@ target_load (char *arg, int from_tty) +@@ -267,6 +268,13 @@ target_load (char *arg, int from_tty) (*current_target.to_load) (arg, from_tty); } @@ -111,18 +98,11 @@ static int nomemory (CORE_ADDR memaddr, char *myaddr, int len, int write, struct target_ops *t) ---- gdb-6.3/gdb/target.h.fix Tue Jan 18 17:02:42 2005 -+++ gdb-6.3/gdb/target.h Tue Jan 18 17:15:30 2005 -@@ -1,7 +1,7 @@ - /* Interface between GDB and target environments, including files and processes - - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -- 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+ 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - - Contributed by Cygnus Support. Written by John Gilmore. - -@@ -779,8 +779,7 @@ extern void target_load (char *arg, int +Index: gdb-6.5/gdb/target.h +=================================================================== +--- gdb-6.5.orig/gdb/target.h 2006-07-07 03:52:40.000000000 -0300 ++++ gdb-6.5/gdb/target.h 2006-07-07 04:19:00.000000000 -0300 +@@ -783,8 +783,7 @@ int target_follow_fork (int follow_child /* The inferior process has died. Do what is right. */ diff --git a/gdb-6.3-pie-20050110.patch b/gdb-6.3-pie-20050110.patch index 3d24873..2954f5b 100644 --- a/gdb-6.3-pie-20050110.patch +++ b/gdb-6.3-pie-20050110.patch @@ -1,6 +1,8 @@ ---- gdb-6.3/gdb/dwarf2read.c.fix Mon Jan 10 14:36:22 2005 -+++ gdb-6.3/gdb/dwarf2read.c Mon Jan 10 14:39:34 2005 -@@ -1201,7 +1201,7 @@ dwarf2_build_psymtabs (struct objfile *o +Index: gdb-6.5/gdb/dwarf2read.c +=================================================================== +--- gdb-6.5.orig/gdb/dwarf2read.c 2006-07-11 02:47:11.000000000 -0300 ++++ gdb-6.5/gdb/dwarf2read.c 2006-07-11 02:56:58.000000000 -0300 +@@ -1208,7 +1208,7 @@ dwarf2_build_psymtabs (struct objfile *o else dwarf2_per_objfile->loc_buffer = NULL; @@ -9,17 +11,19 @@ || (objfile->global_psymbols.size == 0 && objfile->static_psymbols.size == 0)) { ---- gdb-6.3/gdb/auxv.c.fix Mon Jan 10 14:36:34 2005 -+++ gdb-6.3/gdb/auxv.c Mon Jan 10 14:39:34 2005 +Index: gdb-6.5/gdb/auxv.c +=================================================================== +--- gdb-6.5.orig/gdb/auxv.c 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/auxv.c 2006-07-11 02:47:11.000000000 -0300 @@ -119,7 +119,7 @@ target_auxv_read (struct target_ops *ops Return 1 if an entry was read into *TYPEP and *VALP. */ int - target_auxv_parse (struct target_ops *ops, char **readptr, char *endptr, -- CORE_ADDR *typep, CORE_ADDR *valp) -+ ULONGEST *typep, CORE_ADDR *valp) + target_auxv_parse (struct target_ops *ops, gdb_byte **readptr, +- gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp) ++ gdb_byte *endptr, ULONGEST *typep, CORE_ADDR *valp) { const int sizeof_auxv_field = TYPE_LENGTH (builtin_type_void_data_ptr); - char *ptr = *readptr; + gdb_byte *ptr = *readptr; @@ -144,9 +144,10 @@ target_auxv_parse (struct target_ops *op an error getting the information. On success, return 1 after storing the entry's value field in *VALP. */ @@ -30,9 +34,9 @@ - CORE_ADDR type, val; + CORE_ADDR val; + ULONGEST at_type; - char *data; + gdb_byte *data; int n = target_auxv_read (ops, &data); - char *ptr = data; + gdb_byte *ptr = data; @@ -156,10 +157,10 @@ target_auxv_search (struct target_ops *o return n; @@ -53,9 +57,9 @@ - CORE_ADDR type, val; + CORE_ADDR val; + ULONGEST at_type; - char *data; + gdb_byte *data; int len = target_auxv_read (ops, &data); - char *ptr = data; + gdb_byte *ptr = data; @@ -191,14 +193,14 @@ fprint_target_auxv (struct ui_file *file if (len <= 0) return len; @@ -82,12 +86,14 @@ switch (flavor) { case dec: ---- gdb-6.3/gdb/auxv.h.fix Mon Jan 10 14:36:39 2005 -+++ gdb-6.3/gdb/auxv.h Mon Jan 10 14:39:34 2005 +Index: gdb-6.5/gdb/auxv.h +=================================================================== +--- gdb-6.5.orig/gdb/auxv.h 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/auxv.h 2006-07-11 02:47:11.000000000 -0300 @@ -43,14 +43,14 @@ extern LONGEST target_auxv_read (struct Return 1 if an entry was read into *TYPEP and *VALP. */ extern int target_auxv_parse (struct target_ops *ops, - char **readptr, char *endptr, + gdb_byte **readptr, gdb_byte *endptr, - CORE_ADDR *typep, CORE_ADDR *valp); + ULONGEST *typep, CORE_ADDR *valp); @@ -101,8 +107,10 @@ /* Print the contents of the target's AUXV on the specified file. */ extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops); ---- gdb-6.3/gdb/breakpoint.h.fix Mon Jan 10 14:36:45 2005 -+++ gdb-6.3/gdb/breakpoint.h Mon Jan 10 14:39:34 2005 +Index: gdb-6.5/gdb/breakpoint.h +=================================================================== +--- gdb-6.5.orig/gdb/breakpoint.h 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/breakpoint.h 2006-07-11 02:47:11.000000000 -0300 @@ -159,6 +159,7 @@ enum enable_state automatically enabled and reset when the call "lands" (either completes, or stops at another @@ -111,7 +119,7 @@ bp_permanent /* There is a breakpoint instruction hard-wired into the target's code. Don't try to write another breakpoint instruction on top of it, or restore -@@ -778,8 +779,12 @@ extern void remove_thread_event_breakpoi +@@ -807,8 +808,12 @@ extern void remove_thread_event_breakpoi extern void disable_breakpoints_in_shlibs (int silent); @@ -124,9 +132,11 @@ extern void create_solib_load_event_breakpoint (char *, int, char *, char *); extern void create_solib_unload_event_breakpoint (char *, int, ---- gdb-6.3/gdb/symfile-mem.c.fix Mon Jan 10 14:36:15 2005 -+++ gdb-6.3/gdb/symfile-mem.c Mon Jan 10 14:39:34 2005 -@@ -103,7 +103,7 @@ symbol_file_add_from_memory (struct bfd +Index: gdb-6.5/gdb/symfile-mem.c +=================================================================== +--- gdb-6.5.orig/gdb/symfile-mem.c 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/symfile-mem.c 2006-07-11 02:56:55.000000000 -0300 +@@ -110,7 +110,7 @@ symbol_file_add_from_memory (struct bfd } objf = symbol_file_add_from_bfd (nbfd, from_tty, @@ -135,9 +145,11 @@ /* This might change our ideas about frames already looked at. */ reinit_frame_cache (); ---- gdb-6.3/gdb/infrun.c.fix Mon Jan 10 14:36:50 2005 -+++ gdb-6.3/gdb/infrun.c Mon Jan 10 14:39:34 2005 -@@ -2203,6 +2203,11 @@ process_event_stop_test: +Index: gdb-6.5/gdb/infrun.c +=================================================================== +--- gdb-6.5.orig/gdb/infrun.c 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/infrun.c 2006-07-11 02:56:58.000000000 -0300 +@@ -2230,6 +2230,11 @@ process_event_stop_test: code segments in shared libraries might be mapped in now. */ re_enable_breakpoints_in_shlibs (); @@ -149,18 +161,21 @@ /* If requested, stop when the dynamic linker notifies gdb of events. This allows the user to get control and place breakpoints in initializer routines for ---- gdb-6.3/gdb/objfiles.c.fix Mon Jan 10 14:37:04 2005 -+++ gdb-6.3/gdb/objfiles.c Mon Jan 10 14:39:34 2005 -@@ -46,6 +46,8 @@ - #include "block.h" +Index: gdb-6.5/gdb/objfiles.c +=================================================================== +--- gdb-6.5.orig/gdb/objfiles.c 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/objfiles.c 2006-07-11 02:47:11.000000000 -0300 +@@ -47,6 +47,9 @@ #include "dictionary.h" + #include "source.h" ++#include "auxv.h" +#include "elf/common.h" + /* Prototypes for local functions */ static void objfile_alloc_data (struct objfile *objfile); -@@ -257,7 +259,19 @@ init_entry_point_info (struct objfile *o +@@ -258,7 +261,19 @@ init_entry_point_info (struct objfile *o CORE_ADDR entry_point_address (void) { @@ -181,17 +196,20 @@ } /* Create the terminating entry of OBJFILE's minimal symbol table. ---- gdb-6.3/gdb/solib-svr4.c.fix Mon Jan 10 14:37:15 2005 -+++ gdb-6.3/gdb/solib-svr4.c Mon Jan 10 14:39:34 2005 -@@ -34,6 +34,7 @@ +Index: gdb-6.5/gdb/solib-svr4.c +=================================================================== +--- gdb-6.5.orig/gdb/solib-svr4.c 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/solib-svr4.c 2006-07-11 02:47:11.000000000 -0300 +@@ -34,6 +34,8 @@ #include "gdbcore.h" #include "target.h" #include "inferior.h" ++#include "auxv.h" +#include "command.h" - #include "solist.h" - #include "solib-svr4.h" -@@ -168,7 +169,9 @@ static CORE_ADDR breakpoint_addr; /* Add + #include "gdb_assert.h" + +@@ -254,7 +256,9 @@ static CORE_ADDR breakpoint_addr; /* Add /* Local function prototypes */ @@ -201,14 +219,14 @@ static CORE_ADDR bfd_lookup_symbol (bfd *, char *, flagword); -@@ -290,22 +293,79 @@ elf_locate_base (void) +@@ -376,22 +380,79 @@ elf_locate_base (void) { struct bfd_section *dyninfo_sect; int dyninfo_sect_size; - CORE_ADDR dyninfo_addr; + CORE_ADDR dyninfo_addr, relocated_dyninfo_addr, entry_addr; - char *buf; - char *bufend; + gdb_byte *buf; + gdb_byte *bufend; int arch_size; + int ret; + @@ -285,7 +303,7 @@ /* Find the DT_DEBUG entry in the the .dynamic section. For mips elf we look for DT_MIPS_RLD_MAP, mips elf apparently has -@@ -332,6 +392,10 @@ elf_locate_base (void) +@@ -418,6 +479,10 @@ elf_locate_base (void) { dyn_ptr = bfd_h_get_32 (exec_bfd, (bfd_byte *) x_dynp->d_un.d_ptr); @@ -296,29 +314,30 @@ return dyn_ptr; } else if (dyn_tag == DT_MIPS_RLD_MAP) -@@ -470,6 +534,10 @@ first_link_map_member (void) - char *r_map_buf = xmalloc (lmo->r_map_size); - struct cleanup *cleanups = make_cleanup (xfree, r_map_buf); +@@ -543,6 +608,10 @@ solib_svr4_r_map (void) + { + struct link_map_offsets *lmo = svr4_fetch_link_map_offsets (); + if (debug_solib) + fprintf_unfiltered (gdb_stdlog, -+ "first_link_map_member: read at 0x%s\n", ++ "solib_svr4_r_map: read at 0x%s\n", + paddr_nz (debug_base + lmo->r_map_offset)); - read_memory (debug_base + lmo->r_map_offset, r_map_buf, lmo->r_map_size); - - /* Assume that the address is unsigned. */ -@@ -583,6 +651,10 @@ svr4_current_sos (void) - CORE_ADDR lm; - struct so_list *head = 0; + return read_memory_typed_address (debug_base + lmo->r_map_offset, + builtin_type_void_data_ptr); + } +@@ -669,6 +738,11 @@ svr4_current_sos (void) struct so_list **link_ptr = &head; + CORE_ADDR ldsomap = 0; + + if (debug_solib) + fprintf_unfiltered (gdb_stdlog, + "svr4_current_sos: exec_bfd %s\n", + exec_bfd->filename); - ++ /* Make sure we've looked up the inferior's dynamic linker's base structure. */ -@@ -593,12 +665,22 @@ svr4_current_sos (void) + if (! debug_base) +@@ -678,11 +752,21 @@ svr4_current_sos (void) /* If we can't find the dynamic linker's base structure, this must not be a dynamically linked executable. Hmm. */ if (! debug_base) @@ -334,18 +353,16 @@ /* Walk the inferior's link map list, and build our list of `struct so_list' nodes. */ -- lm = first_link_map_member (); + if (debug_solib) + fprintf_unfiltered (gdb_stdlog, + "svr4_current_sos: walk link map in %s\n", + exec_bfd->filename); -+ lm = first_link_map_member (); + lm = solib_svr4_r_map (); while (lm) { - struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS (); -@@ -615,54 +697,156 @@ svr4_current_sos (void) +@@ -697,23 +781,103 @@ svr4_current_sos (void) + new->lm_info->lm = xzalloc (lmo->link_map_size); make_cleanup (xfree, new->lm_info->lm); - memset (new->lm_info->lm, 0, lmo->link_map_size); + if (debug_solib) + fprintf_unfiltered (gdb_stdlog, @@ -364,7 +381,7 @@ SVR4, it has no name. For others (Solaris 2.3 for example), it does have a name, so we can no longer use a missing name to decide when to ignore it. */ - if (IGNORE_FIRST_LINK_MAP_ENTRY (new)) + if (IGNORE_FIRST_LINK_MAP_ENTRY (new) && ldsomap == 0) - free_so (new); + { + /* It is the first link map entry, i.e. it is the main executable. */ @@ -448,46 +465,16 @@ target_read_string (LM_NAME (new), &buffer, SO_NAME_MAX_PATH_SIZE - 1, &errcode); if (errcode != 0) - { -- warning ("current_sos: Can't read pathname for load map: %s\n", -+ warning ("svr4_current_sos: Can't read pathname for load map: %s\n", - safe_strerror (errcode)); - } +@@ -721,22 +885,37 @@ svr4_current_sos (void) + safe_strerror (errcode)); else { -+ if (debug_solib) -+ fprintf_unfiltered (gdb_stdlog, -+ "svr4_current_sos: LM_NAME is <%s>\n", -+ buffer); -+ /* The name could be empty, in which case it is the -+ system supplied DSO. */ -+ if (strcmp (buffer, "") == 0) -+ { -+ xfree (buffer); -+ free_so (new); -+ } -+ -+ else -+ { - strncpy (new->so_name, buffer, SO_NAME_MAX_PATH_SIZE - 1); - new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; - xfree (buffer); - strcpy (new->so_original_name, new->so_name); +- strncpy (new->so_name, buffer, SO_NAME_MAX_PATH_SIZE - 1); +- new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; +- xfree (buffer); +- strcpy (new->so_original_name, new->so_name); - } -+ if (debug_solib) -+ { -+ fprintf_unfiltered (gdb_stdlog, -+ "svr4_current_sos: Processing DSO: %s\n", -+ new->so_name); -+ fprintf_unfiltered (gdb_stdlog, -+ "svr4_current_sos: first link entry %d\n", -+ IGNORE_FIRST_LINK_MAP_ENTRY (new)); -+ } -+ -+ new->next = 0; -+ *link_ptr = new; -+ link_ptr = &new->next; - +- - /* If this entry has no name, or its name matches the name - for the main executable, don't include it in the list. */ - if (! new->so_name[0] @@ -498,11 +485,41 @@ - new->next = 0; - *link_ptr = new; - link_ptr = &new->next; -- } -+ } -+ } ++ if (debug_solib) ++ fprintf_unfiltered (gdb_stdlog, ++ "svr4_current_sos: LM_NAME is <%s>\n", ++ buffer); ++ /* The name could be empty, in which case it is the ++ system supplied DSO. */ ++ if (strcmp (buffer, "") == 0) ++ { ++ xfree (buffer); ++ free_so (new); ++ } ++ else ++ { ++ strncpy (new->so_name, buffer, SO_NAME_MAX_PATH_SIZE - 1); ++ new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; ++ xfree (buffer); ++ strcpy (new->so_original_name, new->so_name); ++ if (debug_solib) ++ { ++ fprintf_unfiltered (gdb_stdlog, ++ "svr4_current_sos: Processing DSO: %s\n", ++ new->so_name); ++ fprintf_unfiltered (gdb_stdlog, ++ "svr4_current_sos: first link entry %d\n", ++ IGNORE_FIRST_LINK_MAP_ENTRY (new)); ++ } ++ ++ new->next = 0; ++ *link_ptr = new; ++ link_ptr = &new->next; ++ } + } } +@@ -750,6 +929,11 @@ svr4_current_sos (void) discard_cleanups (old_chain); } @@ -514,16 +531,7 @@ return head; } -@@ -681,7 +865,7 @@ svr4_fetch_objfile_link_map (struct objf - return 0; /* failed somehow... */ - - /* Position ourselves on the first link map. */ -- lm = first_link_map_member (); -+ lm = first_link_map_member (); - while (lm) - { - /* Get info on the layout of the r_debug and link_map structures. */ -@@ -742,7 +926,7 @@ svr4_fetch_objfile_link_map (struct objf +@@ -826,7 +1010,7 @@ svr4_fetch_objfile_link_map (struct objf /* On some systems, the only way to recognize the link map entry for the main executable file is by looking at its name. Return non-zero iff SONAME matches one of the known main executable names. */ @@ -532,7 +540,7 @@ static int match_main (char *soname) { -@@ -756,6 +940,7 @@ match_main (char *soname) +@@ -840,6 +1024,7 @@ match_main (char *soname) return (0); } @@ -540,7 +548,7 @@ /* Return 1 if PC lies in the dynamic symbol resolution code of the SVR4 run time loader. */ -@@ -855,6 +1040,11 @@ enable_break (void) +@@ -939,6 +1124,11 @@ enable_break (void) /* Find the .interp section; if not found, warn the user and drop into the old breakpoint at symbol code. */ interp_sect = bfd_get_section_by_name (exec_bfd, ".interp"); @@ -552,9 +560,9 @@ if (interp_sect) { unsigned int interp_sect_size; -@@ -888,6 +1078,9 @@ enable_break (void) +@@ -972,6 +1162,9 @@ enable_break (void) if (tmp_fd >= 0) - tmp_bfd = bfd_fdopenr (tmp_pathname, gnutarget, tmp_fd); + tmp_bfd = bfd_fopen (tmp_pathname, gnutarget, FOPEN_RB, tmp_fd); + if (debug_solib) + fprintf_unfiltered (gdb_stdlog, @@ -562,7 +570,7 @@ if (tmp_bfd == NULL) goto bkpt_at_symbol; -@@ -968,6 +1161,9 @@ enable_break (void) +@@ -1052,6 +1245,9 @@ enable_break (void) if (sym_addr != 0) { create_solib_event_breakpoint (load_addr + sym_addr); @@ -572,7 +580,7 @@ return 1; } -@@ -1227,6 +1423,8 @@ svr4_solib_create_inferior_hook (void) +@@ -1311,6 +1507,8 @@ svr4_solib_create_inferior_hook (void) while (stop_signal != TARGET_SIGNAL_TRAP); stop_soon = NO_STOP_QUIETLY; #endif /* defined(_SCO_DS) */ @@ -581,7 +589,7 @@ } static void -@@ -1430,6 +1628,75 @@ svr4_lp64_fetch_link_map_offsets (void) +@@ -1493,6 +1691,75 @@ svr4_lp64_fetch_link_map_offsets (void) return lmp; } @@ -610,36 +618,36 @@ + + /* Walk the inferior's link map list, and print the info. */ + -+ lm = first_link_map_member (); ++ lm = solib_svr4_r_map (); + while (lm) + { + int errcode; + char *buffer; + CORE_ADDR load_addr; + -+ struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS (); ++ struct link_map_offsets *lmo = svr4_fetch_link_map_offsets (); + struct so_list *new + = (struct so_list *) xmalloc (sizeof (struct so_list)); + struct cleanup *old_chain = make_cleanup (xfree, new); -+ ++ + memset (new, 0, sizeof (*new)); + + new->lm_info = xmalloc (sizeof (struct lm_info)); + make_cleanup (xfree, new->lm_info); -+ ++ + new->lm_info->lm = xmalloc (lmo->link_map_size); + make_cleanup (xfree, new->lm_info->lm); + memset (new->lm_info->lm, 0, lmo->link_map_size); -+ ++ + if (debug_solib) + fprintf_unfiltered (gdb_stdlog, + "svr4_print_linkmap: read lm at 0x%s\n", paddr_nz(lm)); + read_memory (lm, new->lm_info->lm, lmo->link_map_size); -+ ++ + lm = LM_NEXT (new); -+ ++ + /* Load address. */ -+ load_addr = LM_ADDR (new); ++ load_addr = LM_ADDR_CHECK (new, NULL); + /* Shared object's name. */ + target_read_string (LM_NAME (new), &buffer, + SO_NAME_MAX_PATH_SIZE - 1, &errcode); @@ -657,7 +665,7 @@ static struct target_so_ops svr4_so_ops; -@@ -1453,4 +1720,8 @@ _initialize_svr4_solib (void) +@@ -1515,4 +1782,8 @@ _initialize_svr4_solib (void) /* FIXME: Don't do this here. *_gdbarch_init() should set so_ops. */ current_target_so_ops = &svr4_so_ops; @@ -666,9 +674,11 @@ + "Display the inferior's linkmap."); + } ---- gdb-6.3/gdb/varobj.c.fix Mon Jan 10 14:38:00 2005 -+++ gdb-6.3/gdb/varobj.c Mon Jan 10 14:39:35 2005 -@@ -854,6 +854,62 @@ varobj_list (struct varobj ***varlist) +Index: gdb-6.5/gdb/varobj.c +=================================================================== +--- gdb-6.5.orig/gdb/varobj.c 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/varobj.c 2006-07-11 02:56:57.000000000 -0300 +@@ -870,6 +870,62 @@ varobj_list (struct varobj ***varlist) return rootcount; } @@ -679,17 +689,17 @@ + struct varobj_root *croot; + int mycount = rootcount; + char * name; -+ ++ + croot = rootlist; + while ((croot != NULL) && (mycount > 0)) + { + var = croot->rootvar; -+ ++ + /* Get rid of the memory for the old expression. This also + leaves var->root->exp == NULL, which is ok for the parsing + below. */ -+ free_current_contents ((char **) &var->root->exp); -+ ++ free_current_contents (&var->root->exp); ++ + value_free (var->value); + var->type = NULL; + @@ -701,7 +711,7 @@ + { + return; + } -+ ++ + /* We definitively need to catch errors here. + If evaluate_expression succeeds we got the value we wanted. + But if it fails, we still go on with a call to evaluate_type() */ @@ -709,30 +719,32 @@ + { + /* no error */ + release_value (var->value); -+ if (VALUE_LAZY (var->value)) ++ if (value_lazy (var->value)) + gdb_value_fetch_lazy (var->value); + } + else + var->value = evaluate_type (var->root->exp); -+ -+ var->type = VALUE_TYPE (var->value); -+ ++ ++ var->type = value_type (var->value); ++ + mycount--; + croot = croot->next; + } -+ ++ + if (mycount || (croot != NULL)) + warning + ("varobj_refresh: assertion failed - wrong tally of root vars (%d:%d)", + rootcount, mycount); +} -+ ++ + /* Update the values for a variable and its children. This is a two-pronged attack. First, re-parse the value for the root's expression to see if it's changed. Then go all the way ---- gdb-6.3/gdb/solist.h.fix Mon Jan 10 14:37:45 2005 -+++ gdb-6.3/gdb/solist.h Mon Jan 10 14:39:35 2005 +Index: gdb-6.5/gdb/solist.h +=================================================================== +--- gdb-6.5.orig/gdb/solist.h 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/solist.h 2006-07-11 02:47:11.000000000 -0300 @@ -62,6 +62,8 @@ struct so_list bfd *abfd; char symbols_loaded; /* flag: symbols read in yet? */ @@ -758,33 +770,37 @@ /* FIXME: gdbarch needs to control this variable */ extern struct target_so_ops *current_target_so_ops; -@@ -135,4 +143,6 @@ extern struct target_so_ops *current_tar - #define TARGET_SO_FIND_AND_OPEN_SOLIB \ - (current_target_so_ops->find_and_open_solib) +@@ -126,4 +134,6 @@ extern struct target_so_ops *current_tar + #define TARGET_SO_IN_DYNSYM_RESOLVE_CODE \ + (current_target_so_ops->in_dynsym_resolve_code) +/* Controls the printing of debugging output. */ +extern int debug_solib; #endif ---- gdb-6.3/gdb/varobj.h.fix Mon Jan 10 14:38:06 2005 -+++ gdb-6.3/gdb/varobj.h Mon Jan 10 14:39:35 2005 -@@ -97,4 +97,6 @@ extern int varobj_list (struct varobj ** +Index: gdb-6.5/gdb/varobj.h +=================================================================== +--- gdb-6.5.orig/gdb/varobj.h 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/varobj.h 2006-07-11 02:47:11.000000000 -0300 +@@ -99,4 +99,6 @@ extern int varobj_list (struct varobj ** extern int varobj_update (struct varobj **varp, struct varobj ***changelist); +extern void varobj_refresh(void); + #endif /* VAROBJ_H */ ---- gdb-6.3/gdb/symfile.c.fix Mon Jan 10 14:38:16 2005 -+++ gdb-6.3/gdb/symfile.c Mon Jan 10 14:39:35 2005 -@@ -48,6 +48,7 @@ +Index: gdb-6.5/gdb/symfile.c +=================================================================== +--- gdb-6.5.orig/gdb/symfile.c 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/symfile.c 2006-07-11 02:56:57.000000000 -0300 +@@ -49,6 +49,7 @@ #include "readline/readline.h" #include "gdb_assert.h" #include "block.h" +#include "varobj.h" + #include "observer.h" + #include "exec.h" - #include - #include -@@ -558,7 +559,7 @@ syms_from_objfile (struct objfile *objfi +@@ -658,7 +659,7 @@ syms_from_objfile (struct objfile *objfi /* Now either addrs or offsets is non-zero. */ @@ -793,7 +809,7 @@ { /* We will modify the main symbol table, make sure that all its users will be cleaned up if an error occurs during symbol reading. */ -@@ -586,7 +587,7 @@ syms_from_objfile (struct objfile *objfi +@@ -686,7 +687,7 @@ syms_from_objfile (struct objfile *objfi We no longer warn if the lowest section is not a text segment (as happens for the PA64 port. */ @@ -802,7 +818,7 @@ { asection *lower_sect; asection *sect; -@@ -755,17 +756,21 @@ new_symfile_objfile (struct objfile *obj +@@ -855,17 +856,21 @@ new_symfile_objfile (struct objfile *obj /* If this is the main symbol file we have to clean up all users of the old main symbol file. Otherwise it is sufficient to fixup all the breakpoints that may have been redefined by this symbol file. */ @@ -826,7 +842,7 @@ /* We're done reading the symbol file; finish off complaints. */ clear_complaints (&symfile_complaints, 0, verbo); -@@ -808,7 +813,7 @@ symbol_file_add_with_addrs_or_offsets (b +@@ -908,7 +913,7 @@ symbol_file_add_with_addrs_or_offsets (b interactively wiping out any existing symbols. */ if ((have_full_symbols () || have_partial_symbols ()) @@ -834,11 +850,11 @@ + && (mainline == 1) && from_tty && !query ("Load new symbol table from \"%s\"? ", name)) - error ("Not confirmed."); -@@ -987,6 +992,10 @@ symbol_file_clear (int from_tty) - && !query ("Discard symbol table from `%s'? ", - symfile_objfile->name)) - error ("Not confirmed."); + error (_("Not confirmed.")); +@@ -1089,6 +1094,10 @@ symbol_file_clear (int from_tty) + symfile_objfile->name) + : !query (_("Discard symbol table? ")))) + error (_("Not confirmed.")); +#ifdef CLEAR_SOLIB + CLEAR_SOLIB (); +#endif @@ -846,7 +862,7 @@ free_all_objfiles (); /* solib descriptors may have handles to objfiles. Since their -@@ -1979,6 +1988,8 @@ reread_symbols (void) +@@ -2154,6 +2163,8 @@ reread_symbols (void) /* Discard cleanups as symbol reading was successful. */ discard_cleanups (old_cleanups); @@ -855,7 +871,7 @@ /* If the mtime has changed between the time we set new_modtime and now, we *want* this to be out of date, so don't call stat again now. */ -@@ -2338,6 +2349,7 @@ clear_symtab_users (void) +@@ -2529,6 +2540,7 @@ clear_symtab_users (void) clear_pc_function_cache (); if (deprecated_target_new_objfile_hook) deprecated_target_new_objfile_hook (NULL); @@ -863,9 +879,101 @@ } static void ---- gdb-6.3/gdb/breakpoint.c.fix Mon Jan 10 14:38:20 2005 -+++ gdb-6.3/gdb/breakpoint.c Mon Jan 10 14:39:35 2005 -@@ -3900,6 +3900,7 @@ describe_other_breakpoints (CORE_ADDR pc +Index: gdb-6.5/gdb/breakpoint.c +=================================================================== +--- gdb-6.5.orig/gdb/breakpoint.c 2006-07-11 02:47:11.000000000 -0300 ++++ gdb-6.5/gdb/breakpoint.c 2006-07-11 02:56:59.000000000 -0300 +@@ -782,15 +782,15 @@ insert_watchpoints_for_new_thread (ptid_ + struct value *v = b->owner->val_chain; + + /* Look at each value on the value chain. */ +- for (; v; v = v->next) ++ for (; v; v = value_next (v)) + { + /* If it's a memory location, and GDB actually needed + its contents to evaluate the expression, then we + must watch it. */ + if (VALUE_LVAL (v) == lval_memory +- && ! VALUE_LAZY (v)) ++ && ! value_lazy (v)) + { +- struct type *vtype = check_typedef (VALUE_TYPE (v)); ++ struct type *vtype = check_typedef (value_type (v)); + + /* We only watch structs and arrays if user asked + for it explicitly, never if they just happen to +@@ -802,8 +802,8 @@ insert_watchpoints_for_new_thread (ptid_ + CORE_ADDR addr; + int len, type; + +- addr = VALUE_ADDRESS (v) + VALUE_OFFSET (v); +- len = TYPE_LENGTH (VALUE_TYPE (v)); ++ addr = VALUE_ADDRESS (v) + value_offset (v); ++ len = TYPE_LENGTH (value_type (v)); + type = hw_write; + if (b->owner->type == bp_read_watchpoint) + type = hw_read; +@@ -2680,12 +2680,12 @@ mark_triggered_watchpoints (CORE_ADDR st + || b->type == bp_read_watchpoint + || b->type == bp_access_watchpoint) + { +- for (v = b->val_chain; v; v = v->next) ++ for (v = b->val_chain; v; v = value_next (v)) + { + if (VALUE_LVAL (v) == lval_memory +- && ! VALUE_LAZY (v)) ++ && ! value_lazy (v)) + { +- struct type *vtype = check_typedef (VALUE_TYPE (v)); ++ struct type *vtype = check_typedef (value_type (v)); + + if (v == b->val_chain + || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT +@@ -2693,11 +2693,11 @@ mark_triggered_watchpoints (CORE_ADDR st + { + CORE_ADDR vaddr; + +- vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v); ++ vaddr = VALUE_ADDRESS (v) + value_offset (v); + /* Exact match not required. Within range is + sufficient. */ + if (addr >= vaddr && +- addr < vaddr + TYPE_LENGTH (VALUE_TYPE (v))) ++ addr < vaddr + TYPE_LENGTH (value_type (v))) + b->watchpoint_triggered = 1; + } + } +@@ -2867,12 +2867,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p + bs->stop = 0; + continue; + } +- for (v = b->val_chain; v; v = v->next) ++ for (v = b->val_chain; v; v = value_next (v)) + { + if (VALUE_LVAL (v) == lval_memory +- && ! VALUE_LAZY (v)) ++ && ! value_lazy (v)) + { +- struct type *vtype = check_typedef (VALUE_TYPE (v)); ++ struct type *vtype = check_typedef (value_type (v)); + + if (v == b->val_chain + || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT +@@ -2880,11 +2880,11 @@ bpstat_stop_status (CORE_ADDR bp_addr, p + { + CORE_ADDR vaddr; + +- vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v); ++ vaddr = VALUE_ADDRESS (v) + value_offset (v); + /* Exact match not required. Within range is + sufficient. */ + if (addr >= vaddr && +- addr < vaddr + TYPE_LENGTH (VALUE_TYPE (v))) ++ addr < vaddr + TYPE_LENGTH (value_type (v))) + must_check_value = 1; + } + } +@@ -3931,6 +3931,7 @@ describe_other_breakpoints (CORE_ADDR pc b->number, ((b->enable_state == bp_disabled || b->enable_state == bp_shlib_disabled || @@ -873,9 +981,9 @@ b->enable_state == bp_call_disabled) ? " (disabled)" : b->enable_state == bp_permanent -@@ -4575,6 +4576,62 @@ re_enable_breakpoints_in_shlibs (void) - - #endif +@@ -4609,6 +4610,62 @@ re_enable_breakpoints_in_shlibs (void) + } + } +void +disable_breakpoints_at_startup (int silent) @@ -936,7 +1044,7 @@ static void solib_load_unload_1 (char *hookname, int tempflag, char *dll_pathname, char *cond_string, enum bptype bp_kind) -@@ -6915,6 +6972,7 @@ delete_breakpoint (struct breakpoint *bp +@@ -6955,6 +7012,7 @@ delete_breakpoint (struct breakpoint *bp && !b->loc->duplicate && b->enable_state != bp_disabled && b->enable_state != bp_shlib_disabled @@ -944,7 +1052,7 @@ && !b->pending && b->enable_state != bp_call_disabled) { -@@ -7128,7 +7186,8 @@ breakpoint_re_set_one (void *bint) +@@ -7170,7 +7228,8 @@ breakpoint_re_set_one (void *bint) break; save_enable = b->enable_state; @@ -954,9 +1062,11 @@ b->enable_state = bp_disabled; else /* If resetting a shlib-disabled breakpoint, we don't want to ---- gdb-6.3/gdb/solib.c.fix Mon Jan 10 14:38:26 2005 -+++ gdb-6.3/gdb/solib.c Mon Jan 10 15:04:59 2005 -@@ -47,6 +47,8 @@ +Index: gdb-6.5/gdb/solib.c +=================================================================== +--- gdb-6.5.orig/gdb/solib.c 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/solib.c 2006-07-11 02:47:11.000000000 -0300 +@@ -72,6 +72,8 @@ solib_ops (struct gdbarch *gdbarch) /* external data declarations */ @@ -965,16 +1075,16 @@ /* FIXME: gdbarch needs to control this variable */ struct target_so_ops *current_target_so_ops; -@@ -69,6 +71,8 @@ static char *solib_absolute_prefix = NUL - and LD_LIBRARY_PATH. */ - static char *solib_search_path = NULL; +@@ -102,6 +104,8 @@ The search path for loading non-absolute + value); + } +void add_to_target_sections (int, struct target_ops *, struct so_list *); + /* GLOBAL FUNCTION -@@ -335,7 +339,6 @@ free_so (struct so_list *so) +@@ -372,7 +376,6 @@ free_so (struct so_list *so) xfree (so); } @@ -982,7 +1092,7 @@ /* Return address of first so_list entry in master shared object list. */ struct so_list * master_so_list (void) -@@ -343,7 +346,6 @@ master_so_list (void) +@@ -380,7 +383,6 @@ master_so_list (void) return so_list_head; } @@ -990,7 +1100,7 @@ /* A small stub to get us past the arg-passing pinhole of catch_errors. */ static int -@@ -355,15 +357,40 @@ symbol_add_stub (void *arg) +@@ -392,15 +394,40 @@ symbol_add_stub (void *arg) /* Have we already loaded this shared object? */ ALL_OBJFILES (so->objfile) { @@ -1034,7 +1144,7 @@ free_section_addr_info (sap); return (1); -@@ -458,6 +485,10 @@ update_solib_list (int from_tty, struct +@@ -523,6 +550,10 @@ update_solib_list (int from_tty, struct the inferior's current list. */ while (i) { @@ -1045,7 +1155,7 @@ if (! strcmp (gdb->so_original_name, i->so_original_name)) break; -@@ -511,32 +542,46 @@ update_solib_list (int from_tty, struct +@@ -576,28 +607,7 @@ update_solib_list (int from_tty, struct /* Fill in the rest of each of the `struct so_list' nodes. */ for (i = inferior; i; i = i->next) { @@ -1072,7 +1182,10 @@ - } - } + add_to_target_sections (from_tty, target, i); - } + + /* Notify any observer that the shared object has been + loaded now that we've added it to GDB's tables. */ +@@ -606,6 +616,41 @@ update_solib_list (int from_tty, struct } } @@ -1114,20 +1227,24 @@ /* GLOBAL FUNCTION -@@ -917,4 +962,10 @@ This takes precedence over the environme - deprecated_add_show_from_set (c, &showlist); - set_cmd_cfunc (c, reload_shared_libraries); - set_cmd_completer (c, filename_completer); +@@ -978,4 +1023,12 @@ This takes precedence over the environme + reload_shared_libraries, + show_solib_search_path, + &setlist, &showlist); + -+ c = add_set_cmd ("solib", no_class, var_zinteger, -+ (char *) &debug_solib, -+ "Set debugging of GNU/Linux shlib module.\n\ -+Enables printf debugging output.\n", &setdebuglist); -+ deprecated_add_show_from_set (c, &showdebuglist); ++ add_setshow_boolean_cmd ("solib", no_class, &debug_solib, ++ _("\ ++Set debugging of GNU/Linux shlib module.\n"), _("\ ++Show debugging status of GNU/Linux shlib module.\n"), _("\ ++Enables printf debugging output of GNU/Linux shlib module.\n"), ++ NULL, NULL, ++ &setdebuglist, &showdebuglist); } ---- gdb-6.3/gdb/elfread.c.fix Mon Jan 10 14:38:32 2005 -+++ gdb-6.3/gdb/elfread.c Mon Jan 10 14:39:35 2005 -@@ -528,7 +528,7 @@ elf_symfile_read (struct objfile *objfil +Index: gdb-6.5/gdb/elfread.c +=================================================================== +--- gdb-6.5.orig/gdb/elfread.c 2006-07-11 02:47:06.000000000 -0300 ++++ gdb-6.5/gdb/elfread.c 2006-07-11 02:47:11.000000000 -0300 +@@ -556,7 +556,7 @@ elf_symfile_read (struct objfile *objfil /* If we are reinitializing, or if we have never loaded syms yet, set table to empty. MAINLINE is cleared so that *_read_psymtab functions do not all also re-initialize the psymbol table. */ diff --git a/gdb-6.3-ppc64syscall-20040622.patch b/gdb-6.3-ppc64syscall-20040622.patch index 61d02ff..e5dc4d0 100644 --- a/gdb-6.3-ppc64syscall-20040622.patch +++ b/gdb-6.3-ppc64syscall-20040622.patch @@ -6,14 +6,11 @@ use to skip over first half of a GNU/Linux syscall and update "func_start". -Index: ./gdb/rs6000-tdep.c +Index: gdb-6.5/gdb/rs6000-tdep.c =================================================================== -RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v -retrieving revision 1.215 -diff -p -u -r1.215 rs6000-tdep.c ---- ./gdb/rs6000-tdep.c 20 Jun 2004 17:18:06 -0000 1.215 -+++ ./gdb/rs6000-tdep.c 22 Jun 2004 19:06:46 -0000 -@@ -71,6 +71,7 @@ +--- gdb-6.5.orig/gdb/rs6000-tdep.c 2006-04-23 11:15:01.000000000 -0300 ++++ gdb-6.5/gdb/rs6000-tdep.c 2006-07-07 00:54:50.000000000 -0300 +@@ -76,6 +76,7 @@ struct rs6000_framedata { @@ -21,15 +18,15 @@ diff -p -u -r1.215 rs6000-tdep.c int offset; /* total size of frame --- the distance by which we decrement sp to allocate the frame */ -@@ -694,7 +695,6 @@ store_param_on_stack_p (unsigned long op +@@ -905,7 +906,6 @@ store_param_on_stack_p (unsigned long op static CORE_ADDR skip_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, struct rs6000_framedata *fdata) { - CORE_ADDR orig_pc = pc; CORE_ADDR last_prologue_pc = pc; CORE_ADDR li_found_pc = 0; - char buf[4]; -@@ -712,6 +712,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l + gdb_byte buf[4]; +@@ -923,6 +923,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l int minimal_toc_loaded = 0; int prev_insn_was_prologue_insn = 1; int num_skip_non_prologue_insns = 0; @@ -37,7 +34,7 @@ diff -p -u -r1.215 rs6000-tdep.c int r0_contains_arg = 0; const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (current_gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); -@@ -732,6 +733,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l +@@ -943,6 +944,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l lim_pc = refine_prologue_limit (pc, lim_pc); memset (fdata, 0, sizeof (struct rs6000_framedata)); @@ -45,7 +42,7 @@ diff -p -u -r1.215 rs6000-tdep.c fdata->saved_gpr = -1; fdata->saved_fpr = -1; fdata->saved_vr = -1; -@@ -760,6 +762,55 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l +@@ -971,6 +973,55 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l break; op = extract_signed_integer (buf, 4); @@ -101,12 +98,12 @@ diff -p -u -r1.215 rs6000-tdep.c if ((op & 0xfc1fffff) == 0x7c0802a6) { /* mflr Rx */ /* Since shared library / PIC code, which needs to get its -@@ -913,7 +964,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l - fdata->frameless = 0; - /* Don't skip over the subroutine call if it is not within - the first three instructions of the prologue. */ +@@ -1138,7 +1189,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l + we have no line table information or the line info tells + us that the subroutine call is not part of the line + associated with the prologue. */ - if ((pc - orig_pc) > 8) + if ((pc - fdata->func_start) > 8) - break; - - op = read_memory_integer (pc + 4, 4); + { + struct symtab_and_line prologue_sal = find_pc_line (orig_pc, 0); + struct symtab_and_line this_sal = find_pc_line (pc, 0); diff --git a/gdb-6.3-security-errata-20050610.patch b/gdb-6.3-security-errata-20050610.patch index 035b662..70f50c5 100644 --- a/gdb-6.3-security-errata-20050610.patch +++ b/gdb-6.3-security-errata-20050610.patch @@ -16,114 +16,10 @@ (source_command): Update documentation. Check permissions if FROM_TTY is -1. -bfd changes: - -2005-05-17 H.J. Lu - - * elf.c (group_signature): Check if the symbol table section is - correct. - -2005-05-25 Jakub Jelinek - - * elfcode.h (elf_object_p): Fail if e_shoff != 0, e_shnum == 0 and - first shdr has sh_size == 0. Fail if e_shnum is large to cause - arithmetic overflow when allocating the i_shdr array. - Sanity check sh_link and sh_info fields. Fix e_shstrndx sanity check. - -2005-05-07 Mike Frysinger - - * elfcode.h (elf_object_p): Add more sanity checks on elf header. - -2005-06-21 Jakub Jelinek - - * libbfd-in.h (struct artdata): Add extended_names_size field. - * libbfd.h: Rebuilt. - * coff-rs600.c (_bfd_xcoff_archive_p): Don't clear fields in freshly - allocated object by bfd_zalloc. - * coff64-rs6000.c (xcoff64_archive_p): Likewise. - * ecoff.c (_bfd_ecoff_archive_p): Likewise. - * archive.c (_bfd_generic_mkarchive, bfd_generic_archive_p): Likewise. - (get_extended_arelt_filename): Fail if index is bigger or equal to - extended_names_size. - (_bfd_generic_read_ar_hdr_mag): Don't set bfd_error_malformed_archive, - get_extended_arelt_filename already did that. - (_bfd_slurp_extended_name_table): Initialize extended_names_size field. - Allocate one extra byte and clear it, in case extended names table - is not terminated. - -2005-06-15 Jakub Jelinek - - * libbfd-in.h (bfd_malloc2, bfd_realloc2, bfd_zmalloc2, bfd_alloc2, - bfd_zalloc2): New prototypes. - * bfd-in.h (HALF_BFD_SIZE_TYPE): Define. - * libbfd.c (bfd_malloc2, bfd_realloc2, bfd_zmalloc2): New functions. - * opncls.c (bfd_alloc2, bfd_zalloc2): New functions. - * elf.c (bfd_elf_get_elf_syms, setup_group, assign_section_numbers, - elf_map_symbols, map_sections_to_segments, - assign_file_positions_for_segments, copy_private_bfd_data, - swap_out_syms, _bfd_elf_slurp_version_tables): Use bfd_*alloc2 - where appropriate. - * bfd-in2.h: Rebuilt. - * libbfd.h: Rebuilt. - - * elf.c (_bfd_elf_print_private_bfd_data): Don't crash on bogus - verdef or verneed section. - (_bfd_elf_slurp_version_tables): Handle corrupt verdef and/or - verneed sections gracefully. - * elf32-sparc.c (elf32_sparc_info_to_howto): Don't crash on - bogus relocation values. - * elf64-sparc.c (sparc64_elf_info_to_howto): Likewise. - * elf64-ppc.c (ppc64_elf_info_to_howto): Likewise. - * elf64-s390.c (elf_s390_info_to_howto): Likewise. - * elf32-s390.c (elf_s390_info_to_howto): Likewise. - * elf64-x86-64.c (elf64_x86_64_info_to_howto): Likewise. - * elfxx-ia64.c (lookup_howto): Likewise. - -2005-06-14 Jakub Jelinek - - * elf.c (bfd_elf_get_str_section): Allocate an extra byte after - the end of strtab and clear it. - (elf_read): Remove. - - * elf.c (bfd_section_from_shdr): Fail if name is NULL. - Prevent endless recursion on broken objects. - - * archive.c (do_slurp_coff_armap): Check for overflows. - -2005-05-26 Jakub Jelinek - - * elfcode.h (elf_object_p): Fail if e_shoff != 0, e_shnum == 0 and - first shdr has sh_size == 0. Fail if e_shnum is large to cause - arithmetic overflow when allocating the i_shdr array. - Sanity check sh_link and sh_info fields. Fix e_shstrndx sanity check. - -2005-05-18 H.J. Lu - - * elf.c (group_signature): Check if the symbol table section is - correct. - -2005-05-17 Tavis Ormandy - - * elf.c (bfd_section_from_shdr): Add sanity check when parsing - dynamic sections. - -2005-05-09 Alan Modra - - * elfcode.h (elf_object_p): Add more sanity checks on elf header. - ---- gdb-6.3/include/elf/external.h.fix 2005-07-07 19:14:08.000000000 -0400 -+++ gdb-6.3/include/elf/external.h 2005-07-07 19:18:27.000000000 -0400 -@@ -272,5 +272,8 @@ typedef struct - unsigned char a_val[8]; - } Elf64_External_Auxv; - -+/* Size of SHT_GROUP section entry. */ -+ -+#define GRP_ENTRY_SIZE 4 - - #endif /* _ELF_EXTERNAL_H */ ---- gdb-6.3/gdb/cli/cli-cmds.c.fix 2005-07-07 19:16:17.000000000 -0400 -+++ gdb-6.3/gdb/cli/cli-cmds.c 2005-07-07 19:18:27.000000000 -0400 +Index: gdb-6.5/gdb/cli/cli-cmds.c +=================================================================== +--- gdb-6.5.orig/gdb/cli/cli-cmds.c 2006-07-11 03:22:45.000000000 -0300 ++++ gdb-6.5/gdb/cli/cli-cmds.c 2006-07-11 03:26:36.000000000 -0300 @@ -38,6 +38,7 @@ #include "objfiles.h" #include "source.h" @@ -132,18 +28,9 @@ bfd changes: #include "ui-out.h" -@@ -55,6 +56,8 @@ - #define GDBINIT_FILENAME ".gdbinit" - #endif +@@ -453,12 +454,31 @@ source_command (char *args, int from_tty -+#include -+ - /* Prototypes for local command functions */ - - static void complete_command (char *, int); -@@ -442,12 +445,32 @@ source_command (char *args, int from_tty - stream = fopen (file, FOPEN_RT); - if (!stream) + if (fd == -1) { - if (from_tty) + if (from_tty > 0) @@ -156,27 +43,28 @@ bfd changes: + if (from_tty == -1) + { + struct stat statbuf; -+ int fd = fileno (stream); + if (fstat (fd, &statbuf) < 0) + { + perror_with_name (file); -+ fclose (stream); ++ close (fd); + return; + } + if (statbuf.st_uid != getuid () || (statbuf.st_mode & S_IWOTH)) + { + warning (_("not using untrusted file \"%s\""), file); -+ fclose (stream); ++ close (fd); + return; + } + } +#endif + + stream = fdopen (fd, FOPEN_RT); script_from_file (stream, file); - do_cleanups (old_cleanups); ---- gdb-6.3/gdb/testsuite/gdb.base/gdbinit.exp.fix 2005-07-07 19:19:30.000000000 -0400 -+++ gdb-6.3/gdb/testsuite/gdb.base/gdbinit.exp 2005-07-07 19:18:27.000000000 -0400 +Index: gdb-6.5/gdb/testsuite/gdb.base/gdbinit.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.base/gdbinit.exp 2006-07-11 03:22:48.000000000 -0300 @@ -0,0 +1,98 @@ +# Copyright 2005 +# Free Software Foundation, Inc. @@ -276,13 +164,17 @@ bfd changes: +} + +remote_exec build "rm .gdbinit" ---- gdb-6.3/gdb/testsuite/gdb.base/gdbinit.sample.fix 2005-07-07 19:19:34.000000000 -0400 -+++ gdb-6.3/gdb/testsuite/gdb.base/gdbinit.sample 2005-07-07 19:18:27.000000000 -0400 +Index: gdb-6.5/gdb/testsuite/gdb.base/gdbinit.sample +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.base/gdbinit.sample 2006-07-11 03:22:48.000000000 -0300 @@ -0,0 +1 @@ +echo "\nin gdbinit" ---- gdb-6.3/gdb/main.c.fix 2005-07-07 19:14:26.000000000 -0400 -+++ gdb-6.3/gdb/main.c 2005-07-07 19:18:55.000000000 -0400 -@@ -609,7 +609,7 @@ extern int gdbtk_test (char *); +Index: gdb-6.5/gdb/main.c +=================================================================== +--- gdb-6.5.orig/gdb/main.c 2006-07-11 03:22:45.000000000 -0300 ++++ gdb-6.5/gdb/main.c 2006-07-11 03:27:03.000000000 -0300 +@@ -643,7 +643,7 @@ extern int gdbtk_test (char *); if (!inhibit_gdbinit) { @@ -291,7 +183,7 @@ bfd changes: } /* Do stats; no need to do them elsewhere since we'll only -@@ -695,7 +695,7 @@ extern int gdbtk_test (char *); +@@ -730,7 +730,7 @@ extern int gdbtk_test (char *); || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat))) if (!inhibit_gdbinit) { @@ -300,1916 +192,11 @@ bfd changes: } for (i = 0; i < ncmd; i++) ---- gdb-6.3/gdb/configure.fix 2005-07-07 19:15:29.000000000 -0400 -+++ gdb-6.3/gdb/configure 2005-07-07 19:20:08.000000000 -0400 -@@ -6640,7 +6640,7 @@ else - fi - done - --for ac_func in poll -+for ac_func in getuid - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:6647: checking for $ac_func" >&5 -@@ -6695,7 +6695,7 @@ else - fi - done - --for ac_func in pread64 -+for ac_func in poll - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:6702: checking for $ac_func" >&5 -@@ -6750,7 +6750,7 @@ else - fi - done - --for ac_func in sbrk -+for ac_func in pread64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:6757: checking for $ac_func" >&5 -@@ -6805,7 +6805,7 @@ else - fi - done - --for ac_func in setpgid setpgrp -+for ac_func in sbrk - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:6812: checking for $ac_func" >&5 -@@ -6860,7 +6860,7 @@ else - fi - done - --for ac_func in sigaction sigprocmask sigsetmask -+for ac_func in setpgid setpgrp - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:6867: checking for $ac_func" >&5 -@@ -6915,7 +6915,7 @@ else - fi - done - --for ac_func in socketpair -+for ac_func in sigaction sigprocmask sigsetmask - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:6922: checking for $ac_func" >&5 -@@ -6970,7 +6970,7 @@ else - fi - done - --for ac_func in syscall -+for ac_func in socketpair - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:6977: checking for $ac_func" >&5 -@@ -7025,7 +7025,7 @@ else - fi - done - --for ac_func in ttrace -+for ac_func in syscall - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:7032: checking for $ac_func" >&5 -@@ -7080,7 +7080,7 @@ else - fi - done - --for ac_func in wborder -+for ac_func in ttrace - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:7087: checking for $ac_func" >&5 -@@ -7135,6 +7135,61 @@ else - fi - done - -+for ac_func in wborder -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:7142: checking for $ac_func" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:7170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 -+fi -+done -+ - - # Check the return and argument types of ptrace. No canned test for - # this, so roll our own. -@@ -7154,12 +7209,12 @@ for ac_func in ptrace - do - ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 --echo "configure:7158: checking whether $ac_func is declared" >&5 -+echo "configure:7213: checking whether $ac_func is declared" >&5 - if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "gcc_cv_have_decl_$ac_func=yes" - else -@@ -7207,19 +7262,19 @@ fi - - # Check return type. - echo $ac_n "checking return type of ptrace""... $ac_c" 1>&6 --echo "configure:7211: checking return type of ptrace" >&5 -+echo "configure:7266: checking return type of ptrace" >&5 - if eval "test \"`echo '$''{'gdb_cv_func_ptrace_ret'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_func_ptrace_ret='int' - else -@@ -7238,7 +7293,7 @@ EOF - - # Check argument types. - echo $ac_n "checking types of arguments for ptrace""... $ac_c" 1>&6 --echo "configure:7242: checking types of arguments for ptrace" >&5 -+echo "configure:7297: checking types of arguments for ptrace" >&5 - if eval "test \"`echo '$''{'gdb_cv_func_ptrace_args'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7248,7 +7303,7 @@ for gdb_arg1 in 'int' 'long'; do - for gdb_arg3 in 'int *' 'caddr_t' 'int' 'long'; do - for gdb_arg4 in 'int' 'long'; do - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_func_ptrace_args="$gdb_arg1,$gdb_arg2,$gdb_arg3,$gdb_arg4"; - break 4; -@@ -7269,7 +7324,7 @@ fi - rm -f conftest* - for gdb_arg5 in 'int *' 'int' 'long'; do - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - gdb_cv_func_ptrace_args="$gdb_arg1,$gdb_arg2,$gdb_arg3,$gdb_arg4,$gdb_arg5"; -@@ -7317,7 +7372,7 @@ fi - - if test "$cross_compiling" = no; then - echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 --echo "configure:7321: checking whether setpgrp takes no argument" >&5 -+echo "configure:7376: checking whether setpgrp takes no argument" >&5 - if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7325,7 +7380,7 @@ else - { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_setpgrp_void=no - else -@@ -7370,12 +7425,12 @@ fi - - else - echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 --echo "configure:7374: checking whether setpgrp takes no argument" >&5 -+echo "configure:7429: checking whether setpgrp takes no argument" >&5 - if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7389,7 +7444,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:7393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_func_setpgrp_void=no - else -@@ -7413,12 +7468,12 @@ fi - # Check if sigsetjmp is available. Using AC_CHECK_FUNCS won't do - # since sigsetjmp might only be defined as a macro. - echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 --echo "configure:7417: checking for sigsetjmp" >&5 -+echo "configure:7472: checking for sigsetjmp" >&5 - if eval "test \"`echo '$''{'gdb_cv_func_sigsetjmp'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7427,7 +7482,7 @@ int main() { - sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1); - ; return 0; } - EOF --if { (eval echo configure:7431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_func_sigsetjmp=yes - else -@@ -7453,12 +7508,12 @@ gdb_use_included_regex=yes - # However, if the system regex is GNU regex, then default to *not* - # using the included regex. - echo $ac_n "checking for GNU regex""... $ac_c" 1>&6 --echo "configure:7457: checking for GNU regex" >&5 -+echo "configure:7512: checking for GNU regex" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_gnu_regex'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { -@@ -7468,7 +7523,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:7472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_gnu_regex=yes - else -@@ -7502,12 +7557,12 @@ fi - - # See if defines `struct thread' with a td_pcb member. - echo $ac_n "checking for td_pcb in struct thread""... $ac_c" 1>&6 --echo "configure:7506: checking for td_pcb in struct thread" >&5 -+echo "configure:7561: checking for td_pcb in struct thread" >&5 - if eval "test \"`echo '$''{'gdb_cv_struct_thread_td_pcb'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7515,7 +7570,7 @@ int main() { - struct thread td; td.td_pcb; - ; return 0; } - EOF --if { (eval echo configure:7519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_struct_thread_td_pcb=yes - else -@@ -7537,12 +7592,12 @@ fi - - # See if defines `struct lwp`. - echo $ac_n "checking for struct lwp""... $ac_c" 1>&6 --echo "configure:7541: checking for struct lwp" >&5 -+echo "configure:7596: checking for struct lwp" >&5 - if eval "test \"`echo '$''{'gdb_cv_struct_lwp'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7550,7 +7605,7 @@ int main() { - struct lwp l; - ; return 0; } - EOF --if { (eval echo configure:7554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_struct_lwp=yes - else -@@ -7572,12 +7627,12 @@ fi - - # See if degines `struct reg'. - echo $ac_n "checking for struct reg in machine/reg.h""... $ac_c" 1>&6 --echo "configure:7576: checking for struct reg in machine/reg.h" >&5 -+echo "configure:7631: checking for struct reg in machine/reg.h" >&5 - if eval "test \"`echo '$''{'gdb_cv_struct_reg'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7585,7 +7640,7 @@ int main() { - struct reg r; - ; return 0; } - EOF --if { (eval echo configure:7589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_struct_reg=yes - else -@@ -7608,19 +7663,19 @@ fi - # See if supports the %fs and %gs i386 segment registers. - # Older i386 BSD's don't have the r_fs and r_gs members of `struct reg'. - echo $ac_n "checking for r_fs in struct reg""... $ac_c" 1>&6 --echo "configure:7612: checking for r_fs in struct reg" >&5 -+echo "configure:7667: checking for r_fs in struct reg" >&5 - if eval "test \"`echo '$''{'gdb_cv_struct_reg_r_fs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - struct reg r; r.r_fs; - ; return 0; } - EOF --if { (eval echo configure:7624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_struct_reg_r_fs=yes - else -@@ -7640,19 +7695,19 @@ EOF - - fi - echo $ac_n "checking for r_gs in struct reg""... $ac_c" 1>&6 --echo "configure:7644: checking for r_gs in struct reg" >&5 -+echo "configure:7699: checking for r_gs in struct reg" >&5 - if eval "test \"`echo '$''{'gdb_cv_struct_reg_r_gs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - struct reg r; r.r_gs; - ; return 0; } - EOF --if { (eval echo configure:7656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_struct_reg_r_gs=yes - else -@@ -7674,19 +7729,19 @@ fi - - # See if provides the PTRACE_GETREGS request. - echo $ac_n "checking for PTRACE_GETREGS""... $ac_c" 1>&6 --echo "configure:7678: checking for PTRACE_GETREGS" >&5 -+echo "configure:7733: checking for PTRACE_GETREGS" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getregs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - PTRACE_GETREGS; - ; return 0; } - EOF --if { (eval echo configure:7690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_ptrace_getregs=yes - else -@@ -7708,19 +7763,19 @@ fi - - # See if provides the PTRACE_GETFPXREGS request. - echo $ac_n "checking for PTRACE_GETFPXREGS""... $ac_c" 1>&6 --echo "configure:7712: checking for PTRACE_GETFPXREGS" >&5 -+echo "configure:7767: checking for PTRACE_GETFPXREGS" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getfpxregs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - PTRACE_GETFPXREGS; - ; return 0; } - EOF --if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_ptrace_getfpxregs=yes - else -@@ -7742,12 +7797,12 @@ fi - - # See if provides the PT_GETDBREGS request. - echo $ac_n "checking for PT_GETDBREGS""... $ac_c" 1>&6 --echo "configure:7746: checking for PT_GETDBREGS" >&5 -+echo "configure:7801: checking for PT_GETDBREGS" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_pt_getdbregs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7755,7 +7810,7 @@ int main() { - PT_GETDBREGS; - ; return 0; } - EOF --if { (eval echo configure:7759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_pt_getdbregs=yes - else -@@ -7777,12 +7832,12 @@ fi - - # See if provides the PT_GETXMMREGS request. - echo $ac_n "checking for PT_GETXMMREGS""... $ac_c" 1>&6 --echo "configure:7781: checking for PT_GETXMMREGS" >&5 -+echo "configure:7836: checking for PT_GETXMMREGS" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_pt_getxmmregs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7790,7 +7845,7 @@ int main() { - PT_GETXMMREGS; - ; return 0; } - EOF --if { (eval echo configure:7794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_pt_getxmmregs=yes - else -@@ -7813,19 +7868,19 @@ fi - # See if stdint.h provides the uintptr_t type. - # Autoconf 2.5X has an improved AC_CHECK_TYPE which will simplify this. - echo $ac_n "checking for uintptr_t in stdint.h""... $ac_c" 1>&6 --echo "configure:7817: checking for uintptr_t in stdint.h" >&5 -+echo "configure:7872: checking for uintptr_t in stdint.h" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_uintptr_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - uintptr_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_uintptr_t=yes - else -@@ -7846,12 +7901,12 @@ EOF - fi - - echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6 --echo "configure:7850: checking whether malloc must be declared" >&5 -+echo "configure:7905: checking whether malloc must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7872,7 +7927,7 @@ int main() { - char *(*pfn) = (char *(*)) malloc - ; return 0; } - EOF --if { (eval echo configure:7876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_malloc=no - else -@@ -7893,12 +7948,12 @@ EOF - fi - - echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6 --echo "configure:7897: checking whether realloc must be declared" >&5 -+echo "configure:7952: checking whether realloc must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7919,7 +7974,7 @@ int main() { - char *(*pfn) = (char *(*)) realloc - ; return 0; } - EOF --if { (eval echo configure:7923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_realloc=no - else -@@ -7940,12 +7995,12 @@ EOF - fi - - echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6 --echo "configure:7944: checking whether free must be declared" >&5 -+echo "configure:7999: checking whether free must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7966,7 +8021,7 @@ int main() { - char *(*pfn) = (char *(*)) free - ; return 0; } - EOF --if { (eval echo configure:7970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_free=no - else -@@ -7987,12 +8042,12 @@ EOF - fi - - echo $ac_n "checking whether strerror must be declared""... $ac_c" 1>&6 --echo "configure:7991: checking whether strerror must be declared" >&5 -+echo "configure:8046: checking whether strerror must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_strerror'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -8013,7 +8068,7 @@ int main() { - char *(*pfn) = (char *(*)) strerror - ; return 0; } - EOF --if { (eval echo configure:8017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_strerror=no - else -@@ -8034,12 +8089,12 @@ EOF - fi - - echo $ac_n "checking whether strdup must be declared""... $ac_c" 1>&6 --echo "configure:8038: checking whether strdup must be declared" >&5 -+echo "configure:8093: checking whether strdup must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_strdup'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -8060,7 +8115,7 @@ int main() { - char *(*pfn) = (char *(*)) strdup - ; return 0; } - EOF --if { (eval echo configure:8064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_strdup=no - else -@@ -8081,12 +8136,12 @@ EOF - fi - - echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6 --echo "configure:8085: checking whether strstr must be declared" >&5 -+echo "configure:8140: checking whether strstr must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -8107,7 +8162,7 @@ int main() { - char *(*pfn) = (char *(*)) strstr - ; return 0; } - EOF --if { (eval echo configure:8111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_strstr=no - else -@@ -8128,12 +8183,12 @@ EOF - fi - - echo $ac_n "checking whether canonicalize_file_name must be declared""... $ac_c" 1>&6 --echo "configure:8132: checking whether canonicalize_file_name must be declared" >&5 -+echo "configure:8187: checking whether canonicalize_file_name must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_canonicalize_file_name'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -8154,7 +8209,7 @@ int main() { - char *(*pfn) = (char *(*)) canonicalize_file_name - ; return 0; } - EOF --if { (eval echo configure:8158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_canonicalize_file_name=no - else -@@ -8180,9 +8235,9 @@ fi - # could be expunged. --jsm 1999-03-22 - - echo $ac_n "checking for HPUX save_state structure""... $ac_c" 1>&6 --echo "configure:8184: checking for HPUX save_state structure" >&5 -+echo "configure:8239: checking for HPUX save_state structure" >&5 - cat > conftest.$ac_ext < - EOF -@@ -8197,7 +8252,7 @@ fi - rm -f conftest* - - cat > conftest.$ac_ext < - EOF -@@ -8274,12 +8329,12 @@ fi - - if test "$ac_cv_header_sys_procfs_h" = yes; then - echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8278: checking for pstatus_t in sys/procfs.h" >&5 -+echo "configure:8333: checking for pstatus_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_pstatus_t=yes - else -@@ -8310,12 +8365,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6 - - echo $ac_n "checking for prrun_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8314: checking for prrun_t in sys/procfs.h" >&5 -+echo "configure:8369: checking for prrun_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prrun_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prrun_t=yes - else -@@ -8346,12 +8401,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prrun_t" 1>&6 - - echo $ac_n "checking for gregset_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8350: checking for gregset_t in sys/procfs.h" >&5 -+echo "configure:8405: checking for gregset_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_gregset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_gregset_t=yes - else -@@ -8382,12 +8437,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_gregset_t" 1>&6 - - echo $ac_n "checking for fpregset_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8386: checking for fpregset_t in sys/procfs.h" >&5 -+echo "configure:8441: checking for fpregset_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_fpregset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_fpregset_t=yes - else -@@ -8418,12 +8473,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_fpregset_t" 1>&6 - - echo $ac_n "checking for prgregset_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8422: checking for prgregset_t in sys/procfs.h" >&5 -+echo "configure:8477: checking for prgregset_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prgregset_t=yes - else -@@ -8454,12 +8509,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset_t" 1>&6 - - echo $ac_n "checking for prfpregset_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8458: checking for prfpregset_t in sys/procfs.h" >&5 -+echo "configure:8513: checking for prfpregset_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prfpregset_t=yes - else -@@ -8490,12 +8545,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset_t" 1>&6 - - echo $ac_n "checking for prgregset32_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8494: checking for prgregset32_t in sys/procfs.h" >&5 -+echo "configure:8549: checking for prgregset32_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prgregset32_t=yes - else -@@ -8526,12 +8581,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset32_t" 1>&6 - - echo $ac_n "checking for prfpregset32_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8530: checking for prfpregset32_t in sys/procfs.h" >&5 -+echo "configure:8585: checking for prfpregset32_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prfpregset32_t=yes - else -@@ -8562,12 +8617,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset32_t" 1>&6 - - echo $ac_n "checking for lwpid_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8566: checking for lwpid_t in sys/procfs.h" >&5 -+echo "configure:8621: checking for lwpid_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_lwpid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_lwpid_t=yes - else -@@ -8598,12 +8653,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_lwpid_t" 1>&6 - - echo $ac_n "checking for psaddr_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8602: checking for psaddr_t in sys/procfs.h" >&5 -+echo "configure:8657: checking for psaddr_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_psaddr_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_psaddr_t=yes - else -@@ -8634,12 +8689,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_psaddr_t" 1>&6 - - echo $ac_n "checking for prsysent_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8638: checking for prsysent_t in sys/procfs.h" >&5 -+echo "configure:8693: checking for prsysent_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prsysent_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prsysent_t=yes - else -@@ -8670,12 +8725,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prsysent_t" 1>&6 - - echo $ac_n "checking for pr_sigset_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8674: checking for pr_sigset_t in sys/procfs.h" >&5 -+echo "configure:8729: checking for pr_sigset_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_sigset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_pr_sigset_t=yes - else -@@ -8706,12 +8761,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_pr_sigset_t" 1>&6 - - echo $ac_n "checking for pr_sigaction64_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8710: checking for pr_sigaction64_t in sys/procfs.h" >&5 -+echo "configure:8765: checking for pr_sigaction64_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_sigaction64_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_pr_sigaction64_t=yes - else -@@ -8742,12 +8797,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_pr_sigaction64_t" 1>&6 - - echo $ac_n "checking for pr_siginfo64_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8746: checking for pr_siginfo64_t in sys/procfs.h" >&5 -+echo "configure:8801: checking for pr_siginfo64_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_siginfo64_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_pr_siginfo64_t=yes - else -@@ -8783,7 +8838,7 @@ EOF - - if test $bfd_cv_have_sys_procfs_type_prfpregset_t = yes; then - echo $ac_n "checking whether prfpregset_t type is broken""... $ac_c" 1>&6 --echo "configure:8787: checking whether prfpregset_t type is broken" >&5 -+echo "configure:8842: checking whether prfpregset_t type is broken" >&5 - if eval "test \"`echo '$''{'gdb_cv_prfpregset_t_broken'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8791,7 +8846,7 @@ else - gdb_cv_prfpregset_t_broken=yes - else - cat > conftest.$ac_ext < - int main () -@@ -8801,7 +8856,7 @@ else - return 0; - } - EOF --if { (eval echo configure:8805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - gdb_cv_prfpregset_t_broken=no - else -@@ -8826,12 +8881,12 @@ EOF - - - echo $ac_n "checking for PIOCSET ioctl entry in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8830: checking for PIOCSET ioctl entry in sys/procfs.h" >&5 -+echo "configure:8885: checking for PIOCSET ioctl entry in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_procfs_piocset'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -8844,7 +8899,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:8848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_procfs_piocset=yes - else -@@ -8868,19 +8923,19 @@ fi - if test ${host} = ${target} ; then - - echo $ac_n "checking for member l_addr in struct link_map""... $ac_c" 1>&6 --echo "configure:8872: checking for member l_addr in struct link_map" >&5 -+echo "configure:8927: checking for member l_addr in struct link_map" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map_with_l_members'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - struct link_map lm; (void) lm.l_addr; - ; return 0; } - EOF --if { (eval echo configure:8884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_struct_link_map_with_l_members=yes - else -@@ -8902,12 +8957,12 @@ EOF - - - echo $ac_n "checking for member lm_addr in struct link_map""... $ac_c" 1>&6 --echo "configure:8906: checking for member lm_addr in struct link_map" >&5 -+echo "configure:8961: checking for member lm_addr in struct link_map" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map_with_lm_members'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -8915,7 +8970,7 @@ int main() { - struct link_map lm; (void) lm.lm_addr; - ; return 0; } - EOF --if { (eval echo configure:8919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_struct_link_map_with_lm_members=yes - else -@@ -8937,12 +8992,12 @@ EOF - - - echo $ac_n "checking for member som_addr in struct so_map""... $ac_c" 1>&6 --echo "configure:8941: checking for member som_addr in struct so_map" >&5 -+echo "configure:8996: checking for member som_addr in struct so_map" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_struct_so_map_with_som_members'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #ifdef HAVE_NLIST_H -@@ -8953,7 +9008,7 @@ int main() { - struct so_map lm; (void) lm.som_addr; - ; return 0; } - EOF --if { (eval echo configure:8957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_struct_so_map_with_som_members=yes - else -@@ -8975,12 +9030,12 @@ EOF - - - echo $ac_n "checking for struct link_map32 in sys/link.h""... $ac_c" 1>&6 --echo "configure:8979: checking for struct link_map32 in sys/link.h" >&5 -+echo "configure:9034: checking for struct link_map32 in sys/link.h" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -8988,7 +9043,7 @@ int main() { - struct link_map32 l; - ; return 0; } - EOF --if { (eval echo configure:8992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_struct_link_map32=yes - else -@@ -9015,12 +9070,12 @@ fi - - - echo $ac_n "checking for long long support in compiler""... $ac_c" 1>&6 --echo "configure:9019: checking for long long support in compiler" >&5 -+echo "configure:9074: checking for long long support in compiler" >&5 - if eval "test \"`echo '$''{'gdb_cv_c_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_c_long_long=yes - else -@@ -9052,7 +9107,7 @@ fi - - - echo $ac_n "checking for long long support in printf""... $ac_c" 1>&6 --echo "configure:9056: checking for long long support in printf" >&5 -+echo "configure:9111: checking for long long support in printf" >&5 - if eval "test \"`echo '$''{'gdb_cv_printf_has_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9060,7 +9115,7 @@ else - gdb_cv_printf_has_long_long=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - gdb_cv_printf_has_long_long=yes - else -@@ -9098,19 +9153,19 @@ echo "$ac_t""$gdb_cv_printf_has_long_lon - - - echo $ac_n "checking for long double support in compiler""... $ac_c" 1>&6 --echo "configure:9102: checking for long double support in compiler" >&5 -+echo "configure:9157: checking for long double support in compiler" >&5 - if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_long_double=yes - else -@@ -9132,7 +9187,7 @@ fi - - - echo $ac_n "checking for long double support in printf""... $ac_c" 1>&6 --echo "configure:9136: checking for long double support in printf" >&5 -+echo "configure:9191: checking for long double support in printf" >&5 - if eval "test \"`echo '$''{'gdb_cv_printf_has_long_double'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9140,7 +9195,7 @@ else - gdb_cv_printf_has_long_double=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - gdb_cv_printf_has_long_double=yes - else -@@ -9174,7 +9229,7 @@ echo "$ac_t""$gdb_cv_printf_has_long_dou - - - echo $ac_n "checking for long double support in scanf""... $ac_c" 1>&6 --echo "configure:9178: checking for long double support in scanf" >&5 -+echo "configure:9233: checking for long double support in scanf" >&5 - if eval "test \"`echo '$''{'gdb_cv_scanf_has_long_double'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9182,7 +9237,7 @@ else - gdb_cv_scanf_has_long_double=no - else - cat > conftest.$ac_ext < 3.14159 && f < 3.14160); - } - EOF --if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - gdb_cv_scanf_has_long_double=yes - else -@@ -9217,7 +9272,7 @@ echo "$ac_t""$gdb_cv_scanf_has_long_doub - case ${host_os} in - aix*) - echo $ac_n "checking for -bbigtoc option""... $ac_c" 1>&6 --echo "configure:9221: checking for -bbigtoc option" >&5 -+echo "configure:9276: checking for -bbigtoc option" >&5 - if eval "test \"`echo '$''{'gdb_cv_bigtoc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9231,14 +9286,14 @@ else - - LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - : - else - echo "configure: failed program was:" >&5 -@@ -9262,7 +9317,7 @@ if test ${build} = ${host} -a ${host} = - case ${host_os} in - hpux*) - echo $ac_n "checking for HPUX/OSF thread support""... $ac_c" 1>&6 --echo "configure:9266: checking for HPUX/OSF thread support" >&5 -+echo "configure:9321: checking for HPUX/OSF thread support" >&5 - if test -f /usr/include/dce/cma_config.h ; then - if test "$GCC" = "yes" ; then - echo "$ac_t""yes" 1>&6 -@@ -9285,7 +9340,7 @@ EOF - # because version 0 (present on Solaris 2.4 or earlier) doesn't have - # the same API. - echo $ac_n "checking for Solaris thread debugging library""... $ac_c" 1>&6 --echo "configure:9289: checking for Solaris thread debugging library" >&5 -+echo "configure:9344: checking for Solaris thread debugging library" >&5 - if test -f /usr/lib/libthread_db.so.1 ; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -@@ -9295,7 +9350,7 @@ EOF - CONFIG_OBS="${CONFIG_OBS} sol-thread.o" - CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c" - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:9299: checking for dlopen in -ldl" >&5 -+echo "configure:9354: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9303,7 +9358,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9346,17 +9401,17 @@ fi - # all symbols visible in the dynamic symbol table. - hold_ldflags=$LDFLAGS - echo $ac_n "checking for the ld -export-dynamic flag""... $ac_c" 1>&6 --echo "configure:9350: checking for the ld -export-dynamic flag" >&5 -+echo "configure:9405: checking for the ld -export-dynamic flag" >&5 - LDFLAGS="${LDFLAGS} -Wl,-export-dynamic" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - found=yes - else -@@ -9375,13 +9430,13 @@ rm -f conftest* - # Sun randomly tweaked the prototypes in - # at one point. - echo $ac_n "checking if is old""... $ac_c" 1>&6 --echo "configure:9379: checking if is old" >&5 -+echo "configure:9434: checking if is old" >&5 - if eval "test \"`echo '$''{'gdb_cv_proc_service_is_old'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext < -@@ -9392,7 +9447,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_proc_service_is_old=no - else -@@ -9418,12 +9473,12 @@ EOF - ;; - aix*) - echo $ac_n "checking for AiX thread debugging library""... $ac_c" 1>&6 --echo "configure:9422: checking for AiX thread debugging library" >&5 -+echo "configure:9477: checking for AiX thread debugging library" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_aix_thread_debug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { -@@ -9432,7 +9487,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:9436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_aix_thread_debug=yes - else -@@ -9457,19 +9512,19 @@ fi - - if test "x$ac_cv_header_thread_db_h" = "xyes"; then - echo $ac_n "checking whether has TD_NOTALLOC""... $ac_c" 1>&6 --echo "configure:9461: checking whether has TD_NOTALLOC" >&5 -+echo "configure:9516: checking whether has TD_NOTALLOC" >&5 - if eval "test \"`echo '$''{'gdb_cv_thread_db_h_has_td_notalloc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - int i = TD_NOTALLOC; - ; return 0; } - EOF --if { (eval echo configure:9473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_thread_db_h_has_td_notalloc=yes - else -@@ -9494,19 +9549,19 @@ fi - - if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then - echo $ac_n "checking whether has __NR_tkill""... $ac_c" 1>&6 --echo "configure:9498: checking whether has __NR_tkill" >&5 -+echo "configure:9553: checking whether has __NR_tkill" >&5 - if eval "test \"`echo '$''{'gdb_cv_sys_syscall_h_has_tkill'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - int i = __NR_tkill; - ; return 0; } - EOF --if { (eval echo configure:9510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_sys_syscall_h_has_tkill=yes - else -@@ -9619,7 +9674,7 @@ WERROR_CFLAGS="" - if test "x${build_warnings}" != x -a "x$GCC" = xyes - then - echo $ac_n "checking compiler warning flags""... $ac_c" 1>&6 --echo "configure:9623: checking compiler warning flags" >&5 -+echo "configure:9678: checking compiler warning flags" >&5 - # Separate out the -Werror flag as some files just cannot be - # compiled with it enabled. - for w in ${build_warnings}; do -@@ -9629,14 +9684,14 @@ echo "configure:9623: checking compiler - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $w" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - WARN_CFLAGS="${WARN_CFLAGS} $w" - else -@@ -9654,12 +9709,12 @@ fi - - # In the Cygwin environment, we need some additional flags. - echo $ac_n "checking for cygwin""... $ac_c" 1>&6 --echo "configure:9658: checking for cygwin" >&5 -+echo "configure:9713: checking for cygwin" >&5 - if eval "test \"`echo '$''{'gdb_cv_os_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&6 --echo "configure:9748: checking for Tcl configuration" >&5 -+echo "configure:9803: checking for Tcl configuration" >&5 - if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9853,7 +9908,7 @@ if test "${with_tkconfig+set}" = set; th - fi - - echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6 --echo "configure:9857: checking for Tk configuration" >&5 -+echo "configure:9912: checking for Tk configuration" >&5 - if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9955,7 +10010,7 @@ fi - - no_tcl=true - echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6 --echo "configure:9959: checking for Tcl private headers. dir=${configdir}" >&5 -+echo "configure:10014: checking for Tcl private headers. dir=${configdir}" >&5 - # Check whether --with-tclinclude or --without-tclinclude was given. - if test "${with_tclinclude+set}" = set; then - withval="$with_tclinclude" -@@ -10021,17 +10076,17 @@ fi - if test x"${ac_cv_c_tclh}" = x ; then - ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6 --echo "configure:10025: checking for tclInt.h" >&5 -+echo "configure:10080: checking for tclInt.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:10035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:10090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -10091,7 +10146,7 @@ fi - # - no_tk=true - echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6 --echo "configure:10095: checking for Tk private headers" >&5 -+echo "configure:10150: checking for Tk private headers" >&5 - # Check whether --with-tkinclude or --without-tkinclude was given. - if test "${with_tkinclude+set}" = set; then - withval="$with_tkinclude" -@@ -10157,17 +10212,17 @@ fi - if test x"${ac_cv_c_tkh}" = x ; then - ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for tk.h""... $ac_c" 1>&6 --echo "configure:10161: checking for tk.h" >&5 -+echo "configure:10216: checking for tk.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:10171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:10226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -10213,7 +10268,7 @@ fi - - - echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6 --echo "configure:10217: checking for Itcl private headers. srcdir=${srcdir}" >&5 -+echo "configure:10272: checking for Itcl private headers. srcdir=${srcdir}" >&5 - if test x"${ac_cv_c_itclh}" = x ; then - for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do - if test -f $i/generic/itcl.h ; then -@@ -10236,7 +10291,7 @@ fi - - - echo $ac_n "checking for Itk private headers. srcdir=${srcdir}""... $ac_c" 1>&6 --echo "configure:10240: checking for Itk private headers. srcdir=${srcdir}" >&5 -+echo "configure:10295: checking for Itk private headers. srcdir=${srcdir}" >&5 - if test x"${ac_cv_c_itkh}" = x ; then - for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do - if test -f $i/generic/itk.h ; then -@@ -10284,7 +10339,7 @@ if test "${with_itclconfig+set}" = set; - fi - - echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6 --echo "configure:10288: checking for Itcl configuration" >&5 -+echo "configure:10343: checking for Itcl configuration" >&5 - if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10387,7 +10442,7 @@ if test "${with_itkconfig+set}" = set; t - fi - - echo $ac_n "checking for Itk configuration""... $ac_c" 1>&6 --echo "configure:10391: checking for Itk configuration" >&5 -+echo "configure:10446: checking for Itk configuration" >&5 - if eval "test \"`echo '$''{'ac_cv_c_itkconfig'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10529,7 +10584,7 @@ fi - # Uses ac_ vars as temps to allow command line to override cache and checks. - # --without-x overrides everything else, but does not touch the cache. - echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:10533: checking for X" >&5 -+echo "configure:10588: checking for X" >&5 - - # Check whether --with-x or --without-x was given. - if test "${with_x+set}" = set; then -@@ -10591,12 +10646,12 @@ if test "$ac_x_includes" = NO; then - - # First, try using that file with no special directory specified. - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:10600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:10655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -10665,14 +10720,14 @@ if test "$ac_x_libraries" = NO; then - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" - # We can link X programs with no special library path. -@@ -10914,7 +10969,7 @@ fi - # We only build gdbserver automatically if host and target are the same. - if test "x$target" = "x$host"; then - echo $ac_n "checking whether gdbserver is supported on this host""... $ac_c" 1>&6 --echo "configure:10918: checking whether gdbserver is supported on this host" >&5 -+echo "configure:10973: checking whether gdbserver is supported on this host" >&5 - if test "x$build_gdbserver" = xyes; then - configdirs="$configdirs gdbserver" - echo "$ac_t""yes" 1>&6 -@@ -10987,12 +11042,12 @@ fi - - - echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 --echo "configure:10991: checking for Cygwin environment" >&5 -+echo "configure:11046: checking for Cygwin environment" >&5 - if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes - else -@@ -11020,19 +11075,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 - CYGWIN= - test "$ac_cv_cygwin" = yes && CYGWIN=yes - echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 --echo "configure:11024: checking for mingw32 environment" >&5 -+echo "configure:11079: checking for mingw32 environment" >&5 - if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes - else -@@ -11051,7 +11106,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y - - - echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 --echo "configure:11055: checking for executable suffix" >&5 -+echo "configure:11110: checking for executable suffix" >&5 - if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11061,7 +11116,7 @@ else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= -- if { (eval echo configure:11065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+ if { (eval echo configure:11120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.c | *.o | *.obj) ;; -@@ -11103,7 +11158,7 @@ fi - - - echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:11107: checking for iconv" >&5 -+echo "configure:11162: checking for iconv" >&5 - if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11111,7 +11166,7 @@ else - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat > conftest.$ac_ext < - #include -@@ -11121,7 +11176,7 @@ iconv_t cd = iconv_open("",""); - iconv_close(cd); - ; return 0; } - EOF --if { (eval echo configure:11125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_func_iconv=yes - else -@@ -11133,7 +11188,7 @@ rm -f conftest* - am_save_LIBS="$LIBS" - LIBS="$LIBS -liconv" - cat > conftest.$ac_ext < - #include -@@ -11143,7 +11198,7 @@ iconv_t cd = iconv_open("",""); - iconv_close(cd); - ; return 0; } - EOF --if { (eval echo configure:11147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -@@ -11164,13 +11219,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 - EOF - - echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 --echo "configure:11168: checking for iconv declaration" >&5 -+echo "configure:11223: checking for iconv declaration" >&5 - if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext < -@@ -11189,7 +11244,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:11193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - am_cv_proto_iconv_arg1="" - else ---- gdb-6.3/gdb/configure.in.fix 2005-07-07 19:15:34.000000000 -0400 -+++ gdb-6.3/gdb/configure.in 2005-07-07 19:18:27.000000000 -0400 -@@ -440,6 +440,7 @@ AC_FUNC_ALLOCA - AC_FUNC_MMAP - AC_FUNC_VFORK - AC_CHECK_FUNCS(canonicalize_file_name realpath) -+AC_CHECK_FUNCS(getuid) - AC_CHECK_FUNCS(poll) - AC_CHECK_FUNCS(pread64) - AC_CHECK_FUNCS(sbrk) ---- gdb-6.3/gdb/Makefile.in.fix 2005-07-07 19:16:06.000000000 -0400 -+++ gdb-6.3/gdb/Makefile.in 2005-07-07 19:18:27.000000000 -0400 -@@ -2751,7 +2751,7 @@ cli-cmds.o: $(srcdir)/cli/cli-cmds.c $(d +Index: gdb-6.5/gdb/Makefile.in +=================================================================== +--- gdb-6.5.orig/gdb/Makefile.in 2006-07-11 03:22:45.000000000 -0300 ++++ gdb-6.5/gdb/Makefile.in 2006-07-11 03:22:48.000000000 -0300 +@@ -2859,7 +2859,7 @@ cli-cmds.o: $(srcdir)/cli/cli-cmds.c $(d $(expression_h) $(frame_h) $(value_h) $(language_h) $(filenames_h) \ $(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) $(top_h) \ $(cli_decode_h) $(cli_script_h) $(cli_setshow_h) $(cli_cmds_h) \ @@ -2217,1376 +204,4 @@ bfd changes: + $(tui_h) $(gdb_stat_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-cmds.c cli-decode.o: $(srcdir)/cli/cli-decode.c $(defs_h) $(symtab_h) \ - $(gdb_regex_h) $(gdb_string_h) $(ui_out_h) $(cli_cmds_h) \ ---- gdb-6.3/gdb/config.in.fix 2005-07-07 19:16:09.000000000 -0400 -+++ gdb-6.3/gdb/config.in 2005-07-07 19:18:55.000000000 -0400 -@@ -203,6 +203,9 @@ - /* Define if you have the getpagesize function. */ - #undef HAVE_GETPAGESIZE - -+/* Define if you have the getuid function. */ -+#undef HAVE_GETUID -+ - /* Define if you have the monstartup function. */ - #undef HAVE_MONSTARTUP - ---- gdb-6.3/bfd/elf.c.fix 2005-07-07 19:09:17.000000000 -0400 -+++ gdb-6.3/bfd/elf.c 2005-07-07 19:18:55.000000000 -0400 -@@ -206,28 +206,6 @@ bfd_elf_hash (const char *namearg) - return h & 0xffffffff; - } - --/* Read a specified number of bytes at a specified offset in an ELF -- file, into a newly allocated buffer, and return a pointer to the -- buffer. */ -- --static char * --elf_read (bfd *abfd, file_ptr offset, bfd_size_type size) --{ -- char *buf; -- -- if ((buf = bfd_alloc (abfd, size)) == NULL) -- return NULL; -- if (bfd_seek (abfd, offset, SEEK_SET) != 0) -- return NULL; -- if (bfd_bread (buf, size, abfd) != size) -- { -- if (bfd_get_error () != bfd_error_system_call) -- bfd_set_error (bfd_error_file_truncated); -- return NULL; -- } -- return buf; --} -- - bfd_boolean - bfd_elf_mkobject (bfd *abfd) - { -@@ -267,7 +245,21 @@ bfd_elf_get_str_section (bfd *abfd, unsi - /* No cached one, attempt to read, and cache what we read. */ - offset = i_shdrp[shindex]->sh_offset; - shstrtabsize = i_shdrp[shindex]->sh_size; -- shstrtab = elf_read (abfd, offset, shstrtabsize); -+ -+ /* Allocate and clear an extra byte at the end, to prevent crashes -+ in case the string table is not terminated. */ -+ if (shstrtabsize + 1 == 0 -+ || (shstrtab = bfd_alloc (abfd, shstrtabsize + 1)) == NULL -+ || bfd_seek (abfd, offset, SEEK_SET) != 0) -+ shstrtab = NULL; -+ else if (bfd_bread (shstrtab, shstrtabsize, abfd) != shstrtabsize) -+ { -+ if (bfd_get_error () != bfd_error_system_call) -+ bfd_set_error (bfd_error_file_truncated); -+ shstrtab = NULL; -+ } -+ else -+ shstrtab[shstrtabsize] = '\0'; - i_shdrp[shindex]->contents = shstrtab; - } - return shstrtab; -@@ -348,7 +340,7 @@ bfd_elf_get_elf_syms (bfd *ibfd, - pos = symtab_hdr->sh_offset + symoffset * extsym_size; - if (extsym_buf == NULL) - { -- alloc_ext = bfd_malloc (amt); -+ alloc_ext = bfd_malloc2 (symcount, extsym_size); - extsym_buf = alloc_ext; - } - if (extsym_buf == NULL -@@ -367,7 +359,8 @@ bfd_elf_get_elf_syms (bfd *ibfd, - pos = shndx_hdr->sh_offset + symoffset * sizeof (Elf_External_Sym_Shndx); - if (extshndx_buf == NULL) - { -- alloc_extshndx = bfd_malloc (amt); -+ alloc_extshndx = bfd_malloc2 (symcount, -+ sizeof (Elf_External_Sym_Shndx)); - extshndx_buf = alloc_extshndx; - } - if (extshndx_buf == NULL -@@ -381,8 +374,7 @@ bfd_elf_get_elf_syms (bfd *ibfd, - - if (intsym_buf == NULL) - { -- bfd_size_type amt = symcount * sizeof (Elf_Internal_Sym); -- intsym_buf = bfd_malloc (amt); -+ intsym_buf = bfd_malloc2 (symcount, sizeof (Elf_Internal_Sym)); - if (intsym_buf == NULL) - goto out; - } -@@ -438,8 +430,11 @@ group_signature (bfd *abfd, Elf_Internal - Elf_External_Sym_Shndx eshndx; - Elf_Internal_Sym isym; - -- /* First we need to ensure the symbol table is available. */ -- if (! bfd_section_from_shdr (abfd, ghdr->sh_link)) -+ /* First we need to ensure the symbol table is available. Make sure -+ that it is a symbol table section. */ -+ hdr = elf_elfsections (abfd) [ghdr->sh_link]; -+ if (hdr->sh_type != SHT_SYMTAB -+ || ! bfd_section_from_shdr (abfd, ghdr->sh_link)) - return NULL; - - /* Go read the symbol. */ -@@ -483,8 +478,9 @@ setup_group (bfd *abfd, Elf_Internal_Shd - { - /* We keep a list of elf section headers for group sections, - so we can find them quickly. */ -- bfd_size_type amt = num_group * sizeof (Elf_Internal_Shdr *); -- elf_tdata (abfd)->group_sect_ptr = bfd_alloc (abfd, amt); -+ bfd_size_type amt; -+ elf_tdata (abfd)->group_sect_ptr -+ = bfd_alloc2 (abfd, num_group, sizeof (Elf_Internal_Shdr *)); - if (elf_tdata (abfd)->group_sect_ptr == NULL) - return FALSE; - -@@ -504,7 +500,8 @@ setup_group (bfd *abfd, Elf_Internal_Shd - /* Read the raw contents. */ - BFD_ASSERT (sizeof (*dest) >= 4); - amt = shdr->sh_size * sizeof (*dest) / 4; -- shdr->contents = bfd_alloc (abfd, amt); -+ shdr->contents = bfd_alloc2 (abfd, shdr->sh_size, -+ sizeof (*dest) / 4); - if (shdr->contents == NULL - || bfd_seek (abfd, shdr->sh_offset, SEEK_SET) != 0 - || (bfd_bread (shdr->contents, shdr->sh_size, abfd) -@@ -1204,8 +1201,9 @@ _bfd_elf_print_private_bfd_data (bfd *ab - for (t = elf_tdata (abfd)->verdef; t != NULL; t = t->vd_nextdef) - { - fprintf (f, "%d 0x%2.2x 0x%8.8lx %s\n", t->vd_ndx, -- t->vd_flags, t->vd_hash, t->vd_nodename); -- if (t->vd_auxptr->vda_nextptr != NULL) -+ t->vd_flags, t->vd_hash, -+ t->vd_nodename ? t->vd_nodename : ""); -+ if (t->vd_auxptr != NULL && t->vd_auxptr->vda_nextptr != NULL) - { - Elf_Internal_Verdaux *a; - -@@ -1213,7 +1211,8 @@ _bfd_elf_print_private_bfd_data (bfd *ab - for (a = t->vd_auxptr->vda_nextptr; - a != NULL; - a = a->vda_nextptr) -- fprintf (f, "%s ", a->vda_nodename); -+ fprintf (f, "%s ", -+ a->vda_nodename ? a->vda_nodename : ""); - fprintf (f, "\n"); - } - } -@@ -1228,10 +1227,12 @@ _bfd_elf_print_private_bfd_data (bfd *ab - { - Elf_Internal_Vernaux *a; - -- fprintf (f, _(" required from %s:\n"), t->vn_filename); -+ fprintf (f, _(" required from %s:\n"), -+ t->vn_filename ? t->vn_filename : ""); - for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr) - fprintf (f, " 0x%8.8lx 0x%2.2x %2.2d %s\n", a->vna_hash, -- a->vna_flags, a->vna_other, a->vna_nodename); -+ a->vna_flags, a->vna_other, -+ a->vna_nodename ? a->vna_nodename : ""); - } - } - -@@ -1725,6 +1726,8 @@ bfd_section_from_shdr (bfd *abfd, unsign - const char *name; - - name = elf_string_from_elf_strtab (abfd, hdr->sh_name); -+ if (name == NULL) -+ return FALSE; - - switch (hdr->sh_type) - { -@@ -1745,6 +1748,9 @@ bfd_section_from_shdr (bfd *abfd, unsign - case SHT_DYNAMIC: /* Dynamic linking information. */ - if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name)) - return FALSE; -+ if (hdr->sh_link > elf_numsections (abfd) -+ || elf_elfsections (abfd)[hdr->sh_link] == NULL) -+ return FALSE; - if (elf_elfsections (abfd)[hdr->sh_link]->sh_type != SHT_STRTAB) - { - Elf_Internal_Shdr *dynsymhdr; -@@ -1779,7 +1785,8 @@ bfd_section_from_shdr (bfd *abfd, unsign - if (elf_onesymtab (abfd) == shindex) - return TRUE; - -- BFD_ASSERT (hdr->sh_entsize == bed->s->sizeof_sym); -+ if (hdr->sh_entsize != bed->s->sizeof_sym) -+ return FALSE; - BFD_ASSERT (elf_onesymtab (abfd) == 0); - elf_onesymtab (abfd) = shindex; - elf_tdata (abfd)->symtab_hdr = *hdr; -@@ -1803,7 +1810,8 @@ bfd_section_from_shdr (bfd *abfd, unsign - if (elf_dynsymtab (abfd) == shindex) - return TRUE; - -- BFD_ASSERT (hdr->sh_entsize == bed->s->sizeof_sym); -+ if (hdr->sh_entsize != bed->s->sizeof_sym) -+ return FALSE; - BFD_ASSERT (elf_dynsymtab (abfd) == 0); - elf_dynsymtab (abfd) = shindex; - elf_tdata (abfd)->dynsymtab_hdr = *hdr; -@@ -1846,6 +1854,9 @@ bfd_section_from_shdr (bfd *abfd, unsign - Elf_Internal_Shdr *hdr2 = elf_elfsections (abfd)[i]; - if (hdr2->sh_link == shindex) - { -+ /* Prevent endless recursion on broken objects. */ -+ if (i == shindex) -+ return FALSE; - if (! bfd_section_from_shdr (abfd, i)) - return FALSE; - if (elf_onesymtab (abfd) == i) -@@ -1889,6 +1900,11 @@ bfd_section_from_shdr (bfd *abfd, unsign - Elf_Internal_Shdr *hdr2; - unsigned int num_sec = elf_numsections (abfd); - -+ if (hdr->sh_entsize -+ != (bfd_size_type) (hdr->sh_type == SHT_REL -+ ? bed->s->sizeof_rel : bed->s->sizeof_rela)) -+ return FALSE; -+ - /* Check for a bogus link to avoid crashing. */ - if ((hdr->sh_link >= SHN_LORESERVE && hdr->sh_link <= SHN_HIRESERVE) - || hdr->sh_link >= num_sec) -@@ -1944,6 +1960,10 @@ bfd_section_from_shdr (bfd *abfd, unsign - if (hdr->sh_link != elf_onesymtab (abfd) || hdr->sh_info == SHN_UNDEF) - return _bfd_elf_make_section_from_shdr (abfd, hdr, name); - -+ /* Prevent endless recursion on broken objects. */ -+ if (elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_REL -+ || elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_RELA) -+ return FALSE; - if (! bfd_section_from_shdr (abfd, hdr->sh_info)) - return FALSE; - target_sect = bfd_section_from_elf_index (abfd, hdr->sh_info); -@@ -1983,6 +2003,8 @@ bfd_section_from_shdr (bfd *abfd, unsign - break; - - case SHT_GNU_versym: -+ if (hdr->sh_entsize != sizeof (Elf_External_Versym)) -+ return FALSE; - elf_dynversym (abfd) = shindex; - elf_tdata (abfd)->dynversym_hdr = *hdr; - return _bfd_elf_make_section_from_shdr (abfd, hdr, name); -@@ -2001,6 +2023,8 @@ bfd_section_from_shdr (bfd *abfd, unsign - /* We need a BFD section for objcopy and relocatable linking, - and it's handy to have the signature available as the section - name. */ -+ if (hdr->sh_entsize != GRP_ENTRY_SIZE) -+ return FALSE; - name = group_signature (abfd, hdr); - if (name == NULL) - return FALSE; -@@ -2724,7 +2748,6 @@ assign_section_numbers (bfd *abfd) - asection *sec; - unsigned int section_number, secn; - Elf_Internal_Shdr **i_shdrp; -- bfd_size_type amt; - - section_number = 1; - -@@ -2798,13 +2821,11 @@ assign_section_numbers (bfd *abfd) - - /* Set up the list of section header pointers, in agreement with the - indices. */ -- amt = section_number * sizeof (Elf_Internal_Shdr *); -- i_shdrp = bfd_zalloc (abfd, amt); -+ i_shdrp = bfd_zalloc2 (abfd, section_number, sizeof (Elf_Internal_Shdr *)); - if (i_shdrp == NULL) - return FALSE; - -- amt = sizeof (Elf_Internal_Shdr); -- i_shdrp[0] = bfd_zalloc (abfd, amt); -+ i_shdrp[0] = bfd_zalloc (abfd, sizeof (Elf_Internal_Shdr)); - if (i_shdrp[0] == NULL) - { - bfd_release (abfd, i_shdrp); -@@ -3036,7 +3057,6 @@ elf_map_symbols (bfd *abfd) - unsigned int idx; - asection *asect; - asymbol **new_syms; -- bfd_size_type amt; - - #ifdef DEBUG - fprintf (stderr, "elf_map_symbols\n"); -@@ -3050,8 +3070,7 @@ elf_map_symbols (bfd *abfd) - } - - max_index++; -- amt = max_index * sizeof (asymbol *); -- sect_syms = bfd_zalloc (abfd, amt); -+ sect_syms = bfd_zalloc2 (abfd, max_index, sizeof (asymbol *)); - if (sect_syms == NULL) - return FALSE; - elf_section_syms (abfd) = sect_syms; -@@ -3124,8 +3143,7 @@ elf_map_symbols (bfd *abfd) - } - - /* Now sort the symbols so the local symbols are first. */ -- amt = (num_locals + num_globals) * sizeof (asymbol *); -- new_syms = bfd_alloc (abfd, amt); -+ new_syms = bfd_alloc2 (abfd, num_locals + num_globals, sizeof (asymbol *)); - - if (new_syms == NULL) - return FALSE; -@@ -3384,8 +3402,7 @@ map_sections_to_segments (bfd *abfd) - - /* Select the allocated sections, and sort them. */ - -- amt = bfd_count_sections (abfd) * sizeof (asection *); -- sections = bfd_malloc (amt); -+ sections = bfd_malloc2 (bfd_count_sections (abfd), sizeof (asection *)); - if (sections == NULL) - goto error_return; - -@@ -3817,7 +3834,6 @@ assign_file_positions_for_segments (bfd - bfd_vma filehdr_vaddr, filehdr_paddr; - bfd_vma phdrs_vaddr, phdrs_paddr; - Elf_Internal_Phdr *p; -- bfd_size_type amt; - - if (elf_tdata (abfd)->segment_map == NULL) - { -@@ -3889,8 +3905,7 @@ assign_file_positions_for_segments (bfd - if (alloc == 0) - alloc = count; - -- amt = alloc * sizeof (Elf_Internal_Phdr); -- phdrs = bfd_alloc (abfd, amt); -+ phdrs = bfd_alloc2 (abfd, alloc, sizeof (Elf_Internal_Phdr)); - if (phdrs == NULL) - return FALSE; - -@@ -5158,8 +5173,7 @@ copy_private_bfd_data (bfd *ibfd, bfd *o - - /* Gcc 2.96 miscompiles this code on mips. Don't do casting here - to work around this long long bug. */ -- amt = section_count * sizeof (asection *); -- sections = bfd_malloc (amt); -+ sections = bfd_malloc2 (section_count, sizeof (asection *)); - if (sections == NULL) - return FALSE; - -@@ -5601,8 +5615,7 @@ swap_out_syms (bfd *abfd, - symstrtab_hdr = &elf_tdata (abfd)->strtab_hdr; - symstrtab_hdr->sh_type = SHT_STRTAB; - -- amt = (bfd_size_type) (1 + symcount) * bed->s->sizeof_sym; -- outbound_syms = bfd_alloc (abfd, amt); -+ outbound_syms = bfd_alloc2 (abfd, 1 + symcount, bed->s->sizeof_sym); - if (outbound_syms == NULL) - { - _bfd_stringtab_free (stt); -@@ -5615,7 +5628,8 @@ swap_out_syms (bfd *abfd, - if (symtab_shndx_hdr->sh_name != 0) - { - amt = (bfd_size_type) (1 + symcount) * sizeof (Elf_External_Sym_Shndx); -- outbound_shndx = bfd_zalloc (abfd, amt); -+ outbound_shndx = bfd_zalloc2 (abfd, 1 + symcount, -+ sizeof (Elf_External_Sym_Shndx)); - if (outbound_shndx == NULL) - { - _bfd_stringtab_free (stt); -@@ -6028,7 +6042,6 @@ bfd_boolean - _bfd_elf_slurp_version_tables (bfd *abfd) - { - bfd_byte *contents = NULL; -- bfd_size_type amt; - - if (elf_dynverdef (abfd) != 0) - { -@@ -6039,6 +6052,7 @@ _bfd_elf_slurp_version_tables (bfd *abfd - Elf_Internal_Verdef iverdefmem; - unsigned int i; - unsigned int maxidx; -+ bfd_byte *contents_end_def, *contents_end_aux; - - hdr = &elf_tdata (abfd)->dynverdef_hdr; - -@@ -6049,6 +6063,16 @@ _bfd_elf_slurp_version_tables (bfd *abfd - || bfd_bread (contents, hdr->sh_size, abfd) != hdr->sh_size) - goto error_return; - -+ if (hdr->sh_info && hdr->sh_size < sizeof (Elf_External_Verdef)) -+ goto error_return; -+ -+ BFD_ASSERT (sizeof (Elf_External_Verdef) -+ >= sizeof (Elf_External_Verdaux)); -+ contents_end_def = contents + hdr->sh_size -+ - sizeof (Elf_External_Verdef); -+ contents_end_aux = contents + hdr->sh_size -+ - sizeof (Elf_External_Verdaux); -+ - /* We know the number of entries in the section but not the maximum - index. Therefore we have to run through all entries and find - the maximum. */ -@@ -6061,12 +6085,16 @@ _bfd_elf_slurp_version_tables (bfd *abfd - if ((iverdefmem.vd_ndx & ((unsigned) VERSYM_VERSION)) > maxidx) - maxidx = iverdefmem.vd_ndx & ((unsigned) VERSYM_VERSION); - -+ if (iverdefmem.vd_next -+ > (size_t) (contents_end_def - (bfd_byte *) everdef)) -+ goto error_return; -+ - everdef = ((Elf_External_Verdef *) - ((bfd_byte *) everdef + iverdefmem.vd_next)); - } - -- amt = (bfd_size_type) maxidx * sizeof (Elf_Internal_Verdef); -- elf_tdata (abfd)->verdef = bfd_zalloc (abfd, amt); -+ elf_tdata (abfd)->verdef = bfd_zalloc2 (abfd, maxidx, -+ sizeof (Elf_Internal_Verdef)); - if (elf_tdata (abfd)->verdef == NULL) - goto error_return; - -@@ -6082,15 +6110,32 @@ _bfd_elf_slurp_version_tables (bfd *abfd - - _bfd_elf_swap_verdef_in (abfd, everdef, &iverdefmem); - -+ if ((iverdefmem.vd_ndx & VERSYM_VERSION) == 0) -+ { -+error_return_verdef: -+ elf_tdata (abfd)->verdef = NULL; -+ elf_tdata (abfd)->cverdefs = 0; -+ goto error_return; -+ } -+ - iverdef = &iverdefarr[(iverdefmem.vd_ndx & VERSYM_VERSION) - 1]; - memcpy (iverdef, &iverdefmem, sizeof (Elf_Internal_Verdef)); - - iverdef->vd_bfd = abfd; - -- amt = (bfd_size_type) iverdef->vd_cnt * sizeof (Elf_Internal_Verdaux); -- iverdef->vd_auxptr = bfd_alloc (abfd, amt); -- if (iverdef->vd_auxptr == NULL) -- goto error_return; -+ if (iverdef->vd_cnt == 0) -+ iverdef->vd_auxptr = NULL; -+ else -+ { -+ iverdef->vd_auxptr = bfd_alloc2 (abfd, iverdef->vd_cnt, -+ sizeof (Elf_Internal_Verdaux)); -+ if (iverdef->vd_auxptr == NULL) -+ goto error_return_verdef; -+ } -+ -+ if (iverdef->vd_aux -+ > (size_t) (contents_end_aux - (bfd_byte *) everdef)) -+ goto error_return_verdef; - - everdaux = ((Elf_External_Verdaux *) - ((bfd_byte *) everdef + iverdef->vd_aux)); -@@ -6103,20 +6148,25 @@ _bfd_elf_slurp_version_tables (bfd *abfd - bfd_elf_string_from_elf_section (abfd, hdr->sh_link, - iverdaux->vda_name); - if (iverdaux->vda_nodename == NULL) -- goto error_return; -+ goto error_return_verdef; - - if (j + 1 < iverdef->vd_cnt) - iverdaux->vda_nextptr = iverdaux + 1; - else - iverdaux->vda_nextptr = NULL; - -+ if (iverdaux->vda_next -+ > (size_t) (contents_end_aux - (bfd_byte *) everdaux)) -+ goto error_return_verdef; -+ - everdaux = ((Elf_External_Verdaux *) - ((bfd_byte *) everdaux + iverdaux->vda_next)); - } - -- iverdef->vd_nodename = iverdef->vd_auxptr->vda_nodename; -+ if (iverdef->vd_cnt) -+ iverdef->vd_nodename = iverdef->vd_auxptr->vda_nodename; - -- if (i + 1 < hdr->sh_info) -+ if ((size_t) (iverdef - iverdefarr) + 1 < maxidx) - iverdef->vd_nextdef = iverdef + 1; - else - iverdef->vd_nextdef = NULL; -@@ -6135,11 +6185,12 @@ _bfd_elf_slurp_version_tables (bfd *abfd - Elf_External_Verneed *everneed; - Elf_Internal_Verneed *iverneed; - unsigned int i; -+ bfd_byte *contents_end; - - hdr = &elf_tdata (abfd)->dynverref_hdr; - -- amt = (bfd_size_type) hdr->sh_info * sizeof (Elf_Internal_Verneed); -- elf_tdata (abfd)->verref = bfd_zalloc (abfd, amt); -+ elf_tdata (abfd)->verref = bfd_zalloc2 (abfd, hdr->sh_info, -+ sizeof (Elf_Internal_Verneed)); - if (elf_tdata (abfd)->verref == NULL) - goto error_return; - -@@ -6147,11 +6198,22 @@ _bfd_elf_slurp_version_tables (bfd *abfd - - contents = bfd_malloc (hdr->sh_size); - if (contents == NULL) -- goto error_return; -+ { -+error_return_verref: -+ elf_tdata (abfd)->verref = NULL; -+ elf_tdata (abfd)->cverrefs = 0; -+ goto error_return; -+ } - if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0 - || bfd_bread (contents, hdr->sh_size, abfd) != hdr->sh_size) -- goto error_return; -+ goto error_return_verref; - -+ if (hdr->sh_info && hdr->sh_size < sizeof (Elf_External_Verneed)) -+ goto error_return_verref; -+ -+ BFD_ASSERT (sizeof (Elf_External_Verneed) -+ == sizeof (Elf_External_Vernaux)); -+ contents_end = contents + hdr->sh_size - sizeof (Elf_External_Verneed); - everneed = (Elf_External_Verneed *) contents; - iverneed = elf_tdata (abfd)->verref; - for (i = 0; i < hdr->sh_info; i++, iverneed++) -@@ -6168,11 +6230,21 @@ _bfd_elf_slurp_version_tables (bfd *abfd - bfd_elf_string_from_elf_section (abfd, hdr->sh_link, - iverneed->vn_file); - if (iverneed->vn_filename == NULL) -- goto error_return; -+ goto error_return_verref; - -- amt = iverneed->vn_cnt; -- amt *= sizeof (Elf_Internal_Vernaux); -- iverneed->vn_auxptr = bfd_alloc (abfd, amt); -+ if (iverneed->vn_cnt == 0) -+ iverneed->vn_auxptr = NULL; -+ else -+ { -+ iverneed->vn_auxptr = bfd_alloc2 (abfd, iverneed->vn_cnt, -+ sizeof (Elf_Internal_Vernaux)); -+ if (iverneed->vn_auxptr == NULL) -+ goto error_return_verref; -+ } -+ -+ if (iverneed->vn_aux -+ > (size_t) (contents_end - (bfd_byte *) everneed)) -+ goto error_return_verref; - - evernaux = ((Elf_External_Vernaux *) - ((bfd_byte *) everneed + iverneed->vn_aux)); -@@ -6185,13 +6257,17 @@ _bfd_elf_slurp_version_tables (bfd *abfd - bfd_elf_string_from_elf_section (abfd, hdr->sh_link, - ivernaux->vna_name); - if (ivernaux->vna_nodename == NULL) -- goto error_return; -+ goto error_return_verref; - - if (j + 1 < iverneed->vn_cnt) - ivernaux->vna_nextptr = ivernaux + 1; - else - ivernaux->vna_nextptr = NULL; - -+ if (ivernaux->vna_next -+ > (size_t) (contents_end - (bfd_byte *) evernaux)) -+ goto error_return_verref; -+ - evernaux = ((Elf_External_Vernaux *) - ((bfd_byte *) evernaux + ivernaux->vna_next)); - } -@@ -6201,6 +6277,10 @@ _bfd_elf_slurp_version_tables (bfd *abfd - else - iverneed->vn_nextref = NULL; - -+ if (iverneed->vn_next -+ > (size_t) (contents_end - (bfd_byte *) everneed)) -+ goto error_return_verref; -+ - everneed = ((Elf_External_Verneed *) - ((bfd_byte *) everneed + iverneed->vn_next)); - } ---- gdb-6.3/bfd/elfcode.h.fix 2005-07-07 19:09:22.000000000 -0400 -+++ gdb-6.3/bfd/elfcode.h 2005-07-07 19:18:55.000000000 -0400 -@@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suit - /* Problems and other issues to resolve. - - (1) BFD expects there to be some fixed number of "sections" in -- the object file. I.E. there is a "section_count" variable in the -+ the object file. I.E. there is a "section_count" variable in the - bfd structure which contains the number of sections. However, ELF - supports multiple "views" of a file. In particular, with current - implementations, executable files typically have two tables, a -@@ -613,8 +613,13 @@ elf_object_p (bfd *abfd) - - if (i_ehdrp->e_shoff != 0) - { -+ bfd_signed_vma where = i_ehdrp->e_shoff; -+ -+ if (where != (file_ptr) where) -+ goto got_wrong_format_error; -+ - /* Seek to the section header table in the file. */ -- if (bfd_seek (abfd, (file_ptr) i_ehdrp->e_shoff, SEEK_SET) != 0) -+ if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0) - goto got_no_match; - - /* Read the first section header at index 0, and convert to internal -@@ -626,11 +631,46 @@ elf_object_p (bfd *abfd) - /* If the section count is zero, the actual count is in the first - section header. */ - if (i_ehdrp->e_shnum == SHN_UNDEF) -- i_ehdrp->e_shnum = i_shdr.sh_size; -+ { -+ i_ehdrp->e_shnum = i_shdr.sh_size; -+ if (i_ehdrp->e_shnum != i_shdr.sh_size -+ || i_ehdrp->e_shnum == 0) -+ goto got_wrong_format_error; -+ } - - /* And similarly for the string table index. */ - if (i_ehdrp->e_shstrndx == SHN_XINDEX) -- i_ehdrp->e_shstrndx = i_shdr.sh_link; -+ { -+ i_ehdrp->e_shstrndx = i_shdr.sh_link; -+ if (i_ehdrp->e_shstrndx != i_shdr.sh_link) -+ goto got_wrong_format_error; -+ } -+ -+ /* Sanity check that we can read all of the section headers. -+ It ought to be good enough to just read the last one. */ -+ if (i_ehdrp->e_shnum != 1) -+ { -+ /* Check that we don't have a totally silly number of sections. */ -+ if (i_ehdrp->e_shnum > (unsigned int) -1 / sizeof (x_shdr) -+ || i_ehdrp->e_shnum > (unsigned int) -1 / sizeof (i_shdr)) -+ goto got_wrong_format_error; -+ -+ where += (i_ehdrp->e_shnum - 1) * sizeof (x_shdr); -+ if (where != (file_ptr) where) -+ goto got_wrong_format_error; -+ if ((bfd_size_type) where <= i_ehdrp->e_shoff) -+ goto got_wrong_format_error; -+ -+ if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0) -+ goto got_no_match; -+ if (bfd_bread (&x_shdr, sizeof x_shdr, abfd) != sizeof (x_shdr)) -+ goto got_no_match; -+ -+ /* Back to where we were. */ -+ where = i_ehdrp->e_shoff + sizeof (x_shdr); -+ if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0) -+ goto got_no_match; -+ } - } - - /* Allocate space for a copy of the section header table in -@@ -674,6 +714,20 @@ elf_object_p (bfd *abfd) - goto got_no_match; - elf_swap_shdr_in (abfd, &x_shdr, i_shdrp + shindex); - -+ /* Sanity check sh_link and sh_info. */ -+ if (i_shdrp[shindex].sh_link >= num_sec -+ || (i_shdrp[shindex].sh_link >= SHN_LORESERVE -+ && i_shdrp[shindex].sh_link <= SHN_HIRESERVE)) -+ goto got_wrong_format_error; -+ -+ if (((i_shdrp[shindex].sh_flags & SHF_INFO_LINK) -+ || i_shdrp[shindex].sh_type == SHT_RELA -+ || i_shdrp[shindex].sh_type == SHT_REL) -+ && (i_shdrp[shindex].sh_info >= num_sec -+ || (i_shdrp[shindex].sh_info >= SHN_LORESERVE -+ && i_shdrp[shindex].sh_info <= SHN_HIRESERVE))) -+ goto got_wrong_format_error; -+ - /* If the section is loaded, but not page aligned, clear - D_PAGED. */ - if (i_shdrp[shindex].sh_size != 0 -@@ -692,6 +746,17 @@ elf_object_p (bfd *abfd) - goto got_no_match; - } - -+ /* A further sanity check. */ -+ if (i_ehdrp->e_shnum != 0) -+ { -+ if (i_ehdrp->e_shstrndx >= elf_numsections (abfd) -+ || (i_ehdrp->e_shstrndx >= SHN_LORESERVE -+ && i_ehdrp->e_shstrndx <= SHN_HIRESERVE)) -+ goto got_wrong_format_error; -+ } -+ else if (i_ehdrp->e_shstrndx != 0) -+ goto got_wrong_format_error; -+ - /* Read in the program headers. */ - if (i_ehdrp->e_phnum == 0) - elf_tdata (abfd)->phdr = NULL; -@@ -1059,7 +1124,7 @@ elf_slurp_symbol_table (bfd *abfd, asymb - symcount); - - /* Slurp in the symbols without the version information, -- since that is more helpful than just quitting. */ -+ since that is more helpful than just quitting. */ - verhdr = NULL; - } - -@@ -1126,7 +1191,7 @@ elf_slurp_symbol_table (bfd *abfd, asymb - sym->symbol.section = bfd_abs_section_ptr; - - /* If this is a relocatable file, then the symbol value is -- already section relative. */ -+ already section relative. */ - if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0) - sym->symbol.value -= sym->symbol.section->vma; - ---- gdb-6.3/bfd/archive.c.fix 2005-07-07 19:09:29.000000000 -0400 -+++ gdb-6.3/bfd/archive.c 2005-07-07 19:18:55.000000000 -0400 -@@ -170,11 +170,13 @@ _bfd_generic_mkarchive (bfd *abfd) - if (bfd_ardata (abfd) == NULL) - return FALSE; - -- bfd_ardata (abfd)->cache = NULL; -- bfd_ardata (abfd)->archive_head = NULL; -- bfd_ardata (abfd)->symdefs = NULL; -- bfd_ardata (abfd)->extended_names = NULL; -- bfd_ardata (abfd)->tdata = NULL; -+ /* Already cleared by bfd_zalloc above. -+ bfd_ardata (abfd)->cache = NULL; -+ bfd_ardata (abfd)->archive_head = NULL; -+ bfd_ardata (abfd)->symdefs = NULL; -+ bfd_ardata (abfd)->extended_names = NULL; -+ bfd_ardata (abfd)->extended_names_size = 0; -+ bfd_ardata (abfd)->tdata = NULL; */ - - return TRUE; - } -@@ -302,7 +304,7 @@ get_extended_arelt_filename (bfd *arch, - errno = 0; - /* Skip first char, which is '/' in SVR4 or ' ' in some other variants. */ - index = strtol (name + 1, NULL, 10); -- if (errno != 0) -+ if (errno != 0 || index >= bfd_ardata (arch)->extended_names_size) - { - bfd_set_error (bfd_error_malformed_archive); - return NULL; -@@ -372,10 +374,7 @@ _bfd_generic_read_ar_hdr_mag (bfd *abfd, - { - filename = get_extended_arelt_filename (abfd, hdr.ar_name); - if (filename == NULL) -- { -- bfd_set_error (bfd_error_malformed_archive); -- return NULL; -- } -+ return NULL; - } - /* BSD4.4-style long filename. - Only implemented for reading, so far! */ -@@ -601,11 +600,13 @@ bfd_generic_archive_p (bfd *abfd) - } - - bfd_ardata (abfd)->first_file_filepos = SARMAG; -- bfd_ardata (abfd)->cache = NULL; -- bfd_ardata (abfd)->archive_head = NULL; -- bfd_ardata (abfd)->symdefs = NULL; -- bfd_ardata (abfd)->extended_names = NULL; -- bfd_ardata (abfd)->tdata = NULL; -+ /* Cleared by bfd_zalloc above. -+ bfd_ardata (abfd)->cache = NULL; -+ bfd_ardata (abfd)->archive_head = NULL; -+ bfd_ardata (abfd)->symdefs = NULL; -+ bfd_ardata (abfd)->extended_names = NULL; -+ bfd_ardata (abfd)->extended_names_size = 0; -+ bfd_ardata (abfd)->tdata = NULL; */ - - if (!BFD_SEND (abfd, _bfd_slurp_armap, (abfd)) - || !BFD_SEND (abfd, _bfd_slurp_extended_name_table, (abfd))) -@@ -804,9 +805,15 @@ do_slurp_coff_armap (bfd *abfd) - /* The coff armap must be read sequentially. So we construct a - bsd-style one in core all at once, for simplicity. */ - -+ if (nsymz > ~ (bfd_size_type) 0 / sizeof (carsym)) -+ return FALSE; -+ - carsym_size = (nsymz * sizeof (carsym)); - ptrsize = (4 * nsymz); - -+ if (carsym_size + stringsize + 1 <= carsym_size) -+ return FALSE; -+ - ardata->symdefs = bfd_zalloc (abfd, carsym_size + stringsize + 1); - if (ardata->symdefs == NULL) - return FALSE; -@@ -1043,6 +1050,7 @@ _bfd_slurp_extended_name_table (bfd *abf - strncmp (nextname, "// ", 16) != 0) - { - bfd_ardata (abfd)->extended_names = NULL; -+ bfd_ardata (abfd)->extended_names_size = 0; - return TRUE; - } - -@@ -1051,7 +1059,11 @@ _bfd_slurp_extended_name_table (bfd *abf - return FALSE; - - amt = namedata->parsed_size; -- bfd_ardata (abfd)->extended_names = bfd_zalloc (abfd, amt); -+ if (amt + 1 == 0) -+ goto byebye; -+ -+ bfd_ardata (abfd)->extended_names_size = amt; -+ bfd_ardata (abfd)->extended_names = bfd_zalloc (abfd, amt + 1); - if (bfd_ardata (abfd)->extended_names == NULL) - { - byebye: -@@ -1074,15 +1086,17 @@ _bfd_slurp_extended_name_table (bfd *abf - trailing '/'. DOS/NT created archive often have \ in them - We'll fix all problems here.. */ - { -- char *temp = bfd_ardata (abfd)->extended_names; -+ char *ext_names = bfd_ardata (abfd)->extended_names; -+ char *temp = ext_names; - char *limit = temp + namedata->parsed_size; - for (; temp < limit; ++temp) - { - if (*temp == '\012') -- temp[temp[-1] == '/' ? -1 : 0] = '\0'; -+ temp[temp > ext_names && temp[-1] == '/' ? -1 : 0] = '\0'; - if (*temp == '\\') - *temp = '/'; - } -+ *limit = '\0'; - } - - /* Pad to an even boundary if you have to. */ ---- gdb-6.3/bfd/libbfd-in.h.fix 2005-07-07 19:09:39.000000000 -0400 -+++ gdb-6.3/bfd/libbfd-in.h 2005-07-07 19:18:55.000000000 -0400 -@@ -61,6 +61,7 @@ struct artdata { - carsym *symdefs; /* the symdef entries */ - symindex symdef_count; /* how many there are */ - char *extended_names; /* clever intel extension */ -+ bfd_size_type extended_names_size; /* Size of extended names */ - /* when more compilers are standard C, this can be a time_t */ - long armap_timestamp; /* Timestamp value written into armap. - This is used for BSD archives to check -@@ -90,6 +91,12 @@ extern void *bfd_realloc - (void *, bfd_size_type); - extern void *bfd_zmalloc - (bfd_size_type); -+extern void *bfd_malloc2 -+ (bfd_size_type, bfd_size_type); -+extern void *bfd_realloc2 -+ (void *, bfd_size_type, bfd_size_type); -+extern void *bfd_zmalloc2 -+ (bfd_size_type, bfd_size_type); - - extern void _bfd_default_error_handler (const char *s, ...); - extern bfd_error_handler_type _bfd_error_handler; -@@ -100,6 +107,10 @@ extern void *bfd_alloc - (bfd *, bfd_size_type); - extern void *bfd_zalloc - (bfd *, bfd_size_type); -+extern void *bfd_alloc2 -+ (bfd *, bfd_size_type, bfd_size_type); -+extern void *bfd_zalloc2 -+ (bfd *, bfd_size_type, bfd_size_type); - extern void bfd_release - (bfd *, void *); - ---- gdb-6.3/bfd/bfd-in.h.fix 2005-07-07 19:09:45.000000000 -0400 -+++ gdb-6.3/bfd/bfd-in.h 2005-07-07 19:18:55.000000000 -0400 -@@ -144,6 +144,9 @@ typedef unsigned long bfd_size_type; - - #endif /* not BFD64 */ - -+#define HALF_BFD_SIZE_TYPE \ -+ (((bfd_size_type) 1) << (8 * sizeof (bfd_size_type) / 2)) -+ - #ifndef BFD_HOST_64_BIT - /* Fall back on a 32 bit type. The idea is to make these types always - available for function return types, but in the case that ---- gdb-6.3/bfd/libbfd.c.fix 2005-07-07 19:09:51.000000000 -0400 -+++ gdb-6.3/bfd/libbfd.c 2005-07-07 19:18:55.000000000 -0400 -@@ -156,6 +156,36 @@ bfd_malloc (bfd_size_type size) - return ptr; - } - -+/* Allocate memory using malloc, nmemb * size with overflow checking. */ -+ -+void * -+bfd_malloc2 (bfd_size_type nmemb, bfd_size_type size) -+{ -+ void *ptr; -+ -+ if ((nmemb | size) >= HALF_BFD_SIZE_TYPE -+ && size != 0 -+ && nmemb > ~(bfd_size_type) 0 / size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return NULL; -+ } -+ -+ size *= nmemb; -+ -+ if (size != (size_t) size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return NULL; -+ } -+ -+ ptr = malloc ((size_t) size); -+ if (ptr == NULL && (size_t) size != 0) -+ bfd_set_error (bfd_error_no_memory); -+ -+ return ptr; -+} -+ - /* Reallocate memory using realloc. */ - - void * -@@ -180,6 +210,40 @@ bfd_realloc (void *ptr, bfd_size_type si - return ret; - } - -+/* Reallocate memory using realloc, nmemb * size with overflow checking. */ -+ -+void * -+bfd_realloc2 (void *ptr, bfd_size_type nmemb, bfd_size_type size) -+{ -+ void *ret; -+ -+ if ((nmemb | size) >= HALF_BFD_SIZE_TYPE -+ && size != 0 -+ && nmemb > ~(bfd_size_type) 0 / size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return NULL; -+ } -+ -+ size *= nmemb; -+ -+ if (size != (size_t) size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return NULL; -+ } -+ -+ if (ptr == NULL) -+ ret = malloc ((size_t) size); -+ else -+ ret = realloc (ptr, (size_t) size); -+ -+ if (ret == NULL && (size_t) size != 0) -+ bfd_set_error (bfd_error_no_memory); -+ -+ return ret; -+} -+ - /* Allocate memory using malloc and clear it. */ - - void * -@@ -205,6 +269,44 @@ bfd_zmalloc (bfd_size_type size) - - return ptr; - } -+ -+/* Allocate memory using malloc (nmemb * size) with overflow checking -+ and clear it. */ -+ -+void * -+bfd_zmalloc2 (bfd_size_type nmemb, bfd_size_type size) -+{ -+ void *ptr; -+ -+ if ((nmemb | size) >= HALF_BFD_SIZE_TYPE -+ && size != 0 -+ && nmemb > ~(bfd_size_type) 0 / size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return NULL; -+ } -+ -+ size *= nmemb; -+ -+ if (size != (size_t) size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return NULL; -+ } -+ -+ ptr = malloc ((size_t) size); -+ -+ if ((size_t) size != 0) -+ { -+ if (ptr == NULL) -+ bfd_set_error (bfd_error_no_memory); -+ else -+ memset (ptr, 0, (size_t) size); -+ } -+ -+ return ptr; -+} -+ - /* - INTERNAL_FUNCTION - bfd_write_bigendian_4byte_int ---- gdb-6.3/bfd/opncls.c.fix 2005-07-07 19:09:59.000000000 -0400 -+++ gdb-6.3/bfd/opncls.c 2005-07-07 19:18:55.000000000 -0400 -@@ -849,6 +849,54 @@ bfd_zalloc (bfd *abfd, bfd_size_type siz - return res; - } - -+void * -+bfd_alloc2 (bfd *abfd, bfd_size_type nmemb, bfd_size_type size) -+{ -+ void *ret; -+ -+ if ((nmemb | size) >= HALF_BFD_SIZE_TYPE -+ && size != 0 -+ && nmemb > ~(bfd_size_type) 0 / size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return NULL; -+ } -+ -+ size *= nmemb; -+ -+ if (size != (unsigned long) size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return NULL; -+ } -+ -+ ret = objalloc_alloc (abfd->memory, (unsigned long) size); -+ if (ret == NULL) -+ bfd_set_error (bfd_error_no_memory); -+ return ret; -+} -+ -+void * -+bfd_zalloc2 (bfd *abfd, bfd_size_type nmemb, bfd_size_type size) -+{ -+ void *res; -+ -+ if ((nmemb | size) >= HALF_BFD_SIZE_TYPE -+ && size != 0 -+ && nmemb > ~(bfd_size_type) 0 / size) -+ { -+ bfd_set_error (bfd_error_no_memory); -+ return NULL; -+ } -+ -+ size *= nmemb; -+ -+ res = bfd_alloc (abfd, size); -+ if (res) -+ memset (res, 0, (size_t) size); -+ return res; -+} -+ - /* Free a block allocated for a BFD. - Note: Also frees all more recently allocated blocks! */ - ---- gdb-6.3/bfd/bfd-in2.h.fix 2005-07-07 19:10:08.000000000 -0400 -+++ gdb-6.3/bfd/bfd-in2.h 2005-07-07 19:18:55.000000000 -0400 -@@ -151,6 +151,9 @@ typedef unsigned long bfd_size_type; - - #endif /* not BFD64 */ - -+#define HALF_BFD_SIZE_TYPE \ -+ (((bfd_size_type) 1) << (8 * sizeof (bfd_size_type) / 2)) -+ - #ifndef BFD_HOST_64_BIT - /* Fall back on a 32 bit type. The idea is to make these types always - available for function return types, but in the case that ---- gdb-6.3/bfd/libbfd.h.fix 2005-07-07 19:10:13.000000000 -0400 -+++ gdb-6.3/bfd/libbfd.h 2005-07-07 19:18:55.000000000 -0400 -@@ -66,6 +66,7 @@ struct artdata { - carsym *symdefs; /* the symdef entries */ - symindex symdef_count; /* how many there are */ - char *extended_names; /* clever intel extension */ -+ bfd_size_type extended_names_size; /* Size of extended names */ - /* when more compilers are standard C, this can be a time_t */ - long armap_timestamp; /* Timestamp value written into armap. - This is used for BSD archives to check -@@ -95,6 +96,12 @@ extern void *bfd_realloc - (void *, bfd_size_type); - extern void *bfd_zmalloc - (bfd_size_type); -+extern void *bfd_malloc2 -+ (bfd_size_type, bfd_size_type); -+extern void *bfd_realloc2 -+ (void *, bfd_size_type, bfd_size_type); -+extern void *bfd_zmalloc2 -+ (bfd_size_type, bfd_size_type); - - extern void _bfd_default_error_handler (const char *s, ...); - extern bfd_error_handler_type _bfd_error_handler; -@@ -105,6 +112,10 @@ extern void *bfd_alloc - (bfd *, bfd_size_type); - extern void *bfd_zalloc - (bfd *, bfd_size_type); -+extern void *bfd_alloc2 -+ (bfd *, bfd_size_type, bfd_size_type); -+extern void *bfd_zalloc2 -+ (bfd *, bfd_size_type, bfd_size_type); - extern void bfd_release - (bfd *, void *); - ---- gdb-6.3/bfd/elf32-sparc.c.fix 2005-07-07 19:10:19.000000000 -0400 -+++ gdb-6.3/bfd/elf32-sparc.c 2005-07-07 19:18:55.000000000 -0400 -@@ -313,7 +313,8 @@ elf32_sparc_info_to_howto (abfd, cache_p - arelent *cache_ptr; - Elf_Internal_Rela *dst; - { -- switch (ELF32_R_TYPE(dst->r_info)) -+ unsigned int r_type = ELF32_R_TYPE(dst->r_info); -+ switch (r_type) - { - case R_SPARC_GNU_VTINHERIT: - cache_ptr->howto = &elf32_sparc_vtinherit_howto; -@@ -328,8 +329,13 @@ elf32_sparc_info_to_howto (abfd, cache_p - break; - - default: -- BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_SPARC_max_std); -- cache_ptr->howto = &_bfd_sparc_elf_howto_table[ELF32_R_TYPE(dst->r_info)]; -+ if (r_type >= (unsigned int) R_SPARC_max_std) -+ { -+ (*_bfd_error_handler) (_("invalid relocation type %d"), -+ (int) r_type); -+ r_type = R_SPARC_NONE; -+ } -+ cache_ptr->howto = &_bfd_sparc_elf_howto_table[r_type]; - } - } - ---- gdb-6.3/bfd/elf64-ppc.c.fix 2005-07-07 19:10:27.000000000 -0400 -+++ gdb-6.3/bfd/elf64-ppc.c 2005-07-07 19:18:55.000000000 -0400 -@@ -2118,8 +2118,13 @@ ppc64_elf_info_to_howto (bfd *abfd ATTRI - ppc_howto_init (); - - type = ELF64_R_TYPE (dst->r_info); -- BFD_ASSERT (type < (sizeof (ppc64_elf_howto_table) -- / sizeof (ppc64_elf_howto_table[0]))); -+ if (type >= (sizeof (ppc64_elf_howto_table) -+ / sizeof (ppc64_elf_howto_table[0]))) -+ { -+ (*_bfd_error_handler) (_("%B: invalid relocation type %d"), -+ abfd, (int) type); -+ type = R_PPC64_NONE; -+ } - cache_ptr->howto = ppc64_elf_howto_table[type]; - } - ---- gdb-6.3/bfd/elf64-sparc.c.fix 2005-07-07 19:10:35.000000000 -0400 -+++ gdb-6.3/bfd/elf64-sparc.c 2005-07-07 19:18:55.000000000 -0400 -@@ -310,8 +310,14 @@ sparc64_elf_info_to_howto (abfd, cache_p - arelent *cache_ptr; - Elf_Internal_Rela *dst; - { -- BFD_ASSERT (ELF64_R_TYPE_ID (dst->r_info) < (unsigned int) R_SPARC_max_std); -- cache_ptr->howto = &sparc64_elf_howto_table[ELF64_R_TYPE_ID (dst->r_info)]; -+ unsigned int r_type = ELF64_R_TYPE_ID (dst->r_info); -+ if (r_type >= (unsigned int) R_SPARC_max_std) -+ { -+ (*_bfd_error_handler) (_("invalid relocation type %d"), -+ (int) r_type); -+ r_type = R_SPARC_NONE; -+ } -+ cache_ptr->howto = &sparc64_elf_howto_table[r_type]; - } - - struct sparc64_elf_section_data ---- gdb-6.3/bfd/elf32-s390.c.fix 2005-07-07 19:10:58.000000000 -0400 -+++ gdb-6.3/bfd/elf32-s390.c 2005-07-07 19:18:55.000000000 -0400 -@@ -350,7 +350,8 @@ elf_s390_info_to_howto (abfd, cache_ptr, - arelent *cache_ptr; - Elf_Internal_Rela *dst; - { -- switch (ELF32_R_TYPE(dst->r_info)) -+ unsigned int r_type = ELF32_R_TYPE(dst->r_info); -+ switch (r_type) - { - case R_390_GNU_VTINHERIT: - cache_ptr->howto = &elf32_s390_vtinherit_howto; -@@ -361,8 +362,13 @@ elf_s390_info_to_howto (abfd, cache_ptr, - break; - - default: -- BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_390_max); -- cache_ptr->howto = &elf_howto_table[ELF32_R_TYPE(dst->r_info)]; -+ if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0])) -+ { -+ (*_bfd_error_handler) (_("%B: invalid relocation type %d"), -+ abfd, (int) r_type); -+ r_type = R_390_NONE; -+ } -+ cache_ptr->howto = &elf_howto_table[r_type]; - } - } - ---- gdb-6.3/bfd/elf64-s390.c.fix 2005-07-07 19:11:09.000000000 -0400 -+++ gdb-6.3/bfd/elf64-s390.c 2005-07-07 19:18:55.000000000 -0400 -@@ -372,7 +372,8 @@ elf_s390_info_to_howto (abfd, cache_ptr, - arelent *cache_ptr; - Elf_Internal_Rela *dst; - { -- switch (ELF64_R_TYPE(dst->r_info)) -+ unsigned int r_type = ELF64_R_TYPE(dst->r_info); -+ switch (r_type) - { - case R_390_GNU_VTINHERIT: - cache_ptr->howto = &elf64_s390_vtinherit_howto; -@@ -383,8 +384,13 @@ elf_s390_info_to_howto (abfd, cache_ptr, - break; - - default: -- BFD_ASSERT (ELF64_R_TYPE(dst->r_info) < (unsigned int) R_390_max); -- cache_ptr->howto = &elf_howto_table[ELF64_R_TYPE(dst->r_info)]; -+ if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0])) -+ { -+ (*_bfd_error_handler) (_("%B: invalid relocation type %d"), -+ abfd, (int) r_type); -+ r_type = R_390_NONE; -+ } -+ cache_ptr->howto = &elf_howto_table[r_type]; - } - } - ---- gdb-6.3/bfd/elfxx-ia64.c.fix 2005-07-07 19:11:16.000000000 -0400 -+++ gdb-6.3/bfd/elfxx-ia64.c 2005-07-07 19:18:55.000000000 -0400 -@@ -479,7 +479,8 @@ lookup_howto (rtype) - elf_code_to_howto_index[ia64_howto_table[i].type] = i; - } - -- BFD_ASSERT (rtype <= R_IA64_MAX_RELOC_CODE); -+ if (rtype > R_IA64_MAX_RELOC_CODE) -+ return 0; - i = elf_code_to_howto_index[rtype]; - if (i >= NELEMS (ia64_howto_table)) - return 0; ---- gdb-6.3/bfd/coffcode.h.fix 2005-07-07 19:11:23.000000000 -0400 -+++ gdb-6.3/bfd/coffcode.h 2005-07-07 19:18:55.000000000 -0400 -@@ -5060,7 +5060,7 @@ coff_slurp_reloc_table (abfd, asect, sym - amt = (bfd_size_type) asect->reloc_count * sizeof (arelent); - reloc_cache = (arelent *) bfd_alloc (abfd, amt); - -- if (reloc_cache == NULL) -+ if (reloc_cache == NULL || native_relocs == NULL) - return FALSE; - - for (idx = 0; idx < asect->reloc_count; idx++) ---- gdb-6.3/bfd/peXXigen.c.fix 2005-07-07 19:11:29.000000000 -0400 -+++ gdb-6.3/bfd/peXXigen.c 2005-07-07 19:18:55.000000000 -0400 -@@ -1167,7 +1167,7 @@ pe_print_idata (abfd, vfile) - bfd_vma toc_address; - bfd_vma start_address; - bfd_byte *data; -- int offset; -+ bfd_vma offset; - - if (!bfd_malloc_and_get_section (abfd, rel_section, &data)) - { -@@ -1178,6 +1178,13 @@ pe_print_idata (abfd, vfile) - - offset = abfd->start_address - rel_section->vma; - -+ if (offset >= rel_section->size || offset + 8 > rel_section->size) -+ { -+ if (data != NULL) -+ free (data); -+ return FALSE; -+ } -+ - start_address = bfd_get_32 (abfd, data + offset); - loadable_toc_address = bfd_get_32 (abfd, data + offset + 4); - toc_address = loadable_toc_address - 32768; -@@ -1251,6 +1258,9 @@ pe_print_idata (abfd, vfile) - if (hint_addr == 0 && first_thunk == 0) - break; - -+ if (dll_name - adj >= section->size) -+ break; -+ - dll = (char *) data + dll_name - adj; - fprintf (file, _("\n\tDLL Name: %s\n"), dll); - ---- gdb-6.3/bfd/coff-rs6000.c.fix 2005-07-07 19:11:38.000000000 -0400 -+++ gdb-6.3/bfd/coff-rs6000.c 2005-07-07 19:18:55.000000000 -0400 -@@ -1294,10 +1294,12 @@ _bfd_xcoff_archive_p (abfd) - if (bfd_ardata (abfd) == (struct artdata *) NULL) - goto error_ret_restore; - -- bfd_ardata (abfd)->cache = NULL; -- bfd_ardata (abfd)->archive_head = NULL; -- bfd_ardata (abfd)->symdefs = NULL; -- bfd_ardata (abfd)->extended_names = NULL; -+ /* Cleared by bfd_zalloc above. -+ bfd_ardata (abfd)->cache = NULL; -+ bfd_ardata (abfd)->archive_head = NULL; -+ bfd_ardata (abfd)->symdefs = NULL; -+ bfd_ardata (abfd)->extended_names = NULL; -+ bfd_ardata (abfd)->extended_names_size = 0; */ - - /* Now handle the two formats. */ - if (magic[1] != 'b') ---- gdb-6.3/bfd/coff64-rs6000.c.fix 2005-07-07 19:11:46.000000000 -0400 -+++ gdb-6.3/bfd/coff64-rs6000.c 2005-07-07 19:18:55.000000000 -0400 -@@ -1983,10 +1983,12 @@ xcoff64_archive_p (abfd) - if (bfd_ardata (abfd) == (struct artdata *) NULL) - goto error_ret_restore; - -- bfd_ardata (abfd)->cache = NULL; -- bfd_ardata (abfd)->archive_head = NULL; -- bfd_ardata (abfd)->symdefs = NULL; -- bfd_ardata (abfd)->extended_names = NULL; -+ /* Already cleared by bfd_zalloc above. -+ bfd_ardata (abfd)->cache = NULL; -+ bfd_ardata (abfd)->archive_head = NULL; -+ bfd_ardata (abfd)->symdefs = NULL; -+ bfd_ardata (abfd)->extended_names = NULL; -+ bfd_ardata (abfd)->extended_names_size = 0; */ - bfd_ardata (abfd)->first_file_filepos = bfd_scan_vma (hdr.firstmemoff, - (const char **) NULL, - 10); ---- gdb-6.3/bfd/ecoff.c.fix 2005-07-07 19:11:51.000000000 -0400 -+++ gdb-6.3/bfd/ecoff.c 2005-07-07 19:18:55.000000000 -0400 -@@ -3329,11 +3329,13 @@ _bfd_ecoff_archive_p (abfd) - } - - bfd_ardata (abfd)->first_file_filepos = SARMAG; -- bfd_ardata (abfd)->cache = NULL; -- bfd_ardata (abfd)->archive_head = NULL; -- bfd_ardata (abfd)->symdefs = NULL; -- bfd_ardata (abfd)->extended_names = NULL; -- bfd_ardata (abfd)->tdata = NULL; -+ /* Already cleared by bfd_zalloc above. -+ bfd_ardata (abfd)->cache = NULL; -+ bfd_ardata (abfd)->archive_head = NULL; -+ bfd_ardata (abfd)->symdefs = NULL; -+ bfd_ardata (abfd)->extended_names = NULL; -+ bfd_ardata (abfd)->extended_names_size = 0; -+ bfd_ardata (abfd)->tdata = NULL; */ - - if (! _bfd_ecoff_slurp_armap (abfd) - || ! _bfd_ecoff_slurp_extended_name_table (abfd)) ---- gdb-6.3/bfd/elf64-x86-64.c.fix 2005-07-07 19:17:31.000000000 -0400 -+++ gdb-6.3/bfd/elf64-x86-64.c 2005-07-07 19:18:55.000000000 -0400 -@@ -176,16 +176,19 @@ elf64_x86_64_info_to_howto (bfd *abfd AT - unsigned r_type, i; - - r_type = ELF64_R_TYPE (dst->r_info); -- if (r_type < (unsigned int) R_X86_64_GNU_VTINHERIT) -+ if (r_type < (unsigned int) R_X86_64_GNU_VTINHERIT -+ || r_type >= (unsigned int) R_X86_64_max) - { -- BFD_ASSERT (r_type <= (unsigned int) R_X86_64_TPOFF32); -+ if (r_type > (unsigned int) R_X86_64_TPOFF32) -+ { -+ (*_bfd_error_handler) (_("%B: invalid relocation type %d"), -+ abfd, (int) r_type); -+ r_type = R_X86_64_NONE; -+ } - i = r_type; - } - else -- { -- BFD_ASSERT (r_type < (unsigned int) R_X86_64_max); -- i = r_type - ((unsigned int) R_X86_64_GNU_VTINHERIT - R_X86_64_TPOFF32 - 1); -- } -+ i = r_type - ((unsigned int) R_X86_64_GNU_VTINHERIT - R_X86_64_TPOFF32 - 1); - cache_ptr->howto = &x86_64_elf_howto_table[i]; - BFD_ASSERT (r_type == cache_ptr->howto->type); - } + $(gdb_regex_h) $(gdb_string_h) $(completer_h) $(ui_out_h) \ diff --git a/gdb-6.3-step-thread-exit-20050211.patch b/gdb-6.3-step-thread-exit-20050211.patch index 04a5895..997f728 100644 --- a/gdb-6.3-step-thread-exit-20050211.patch +++ b/gdb-6.3-step-thread-exit-20050211.patch @@ -20,8 +20,10 @@ * testsuite/gdb.threads/step-thread-exit.c: New testcase. * testsuite/gdb.threads/step-thread-exit.exp: Ditto. ---- gdb-6.3/gdb/testsuite/gdb.threads/step-thread-exit.c.fix 2005-02-11 16:51:43.000000000 -0500 -+++ gdb-6.3/gdb/testsuite/gdb.threads/step-thread-exit.c 2005-02-11 18:27:55.000000000 -0500 +Index: gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.c 2006-07-07 02:26:54.000000000 -0300 @@ -0,0 +1,43 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -66,8 +68,10 @@ +} + + ---- gdb-6.3/gdb/testsuite/gdb.threads/step-thread-exit.exp.fix 2005-02-11 16:51:47.000000000 -0500 -+++ gdb-6.3/gdb/testsuite/gdb.threads/step-thread-exit.exp 2005-02-11 18:28:23.000000000 -0500 +Index: gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.exp 2006-07-07 02:26:54.000000000 -0300 @@ -0,0 +1,100 @@ +# This testcase is part of GDB, the GNU debugger. + @@ -169,9 +173,11 @@ + } +} + ---- gdb-6.3/gdb/infrun.c.fix 2005-02-11 16:50:08.000000000 -0500 -+++ gdb-6.3/gdb/infrun.c 2005-02-11 16:52:45.000000000 -0500 -@@ -1072,6 +1072,7 @@ init_execution_control_state (struct exe +Index: gdb-6.5/gdb/infrun.c +=================================================================== +--- gdb-6.5.orig/gdb/infrun.c 2006-07-07 01:17:35.000000000 -0300 ++++ gdb-6.5/gdb/infrun.c 2006-07-07 02:26:54.000000000 -0300 +@@ -1088,6 +1088,7 @@ init_execution_control_state (struct exe ecs->current_symtab = ecs->sal.symtab; ecs->infwait_state = infwait_normal_state; ecs->waiton_ptid = pid_to_ptid (-1); @@ -179,7 +185,7 @@ ecs->wp = &(ecs->ws); } -@@ -1296,6 +1297,16 @@ handle_inferior_event (struct execution_ +@@ -1307,6 +1308,16 @@ handle_inferior_event (struct execution_ ui_out_text (uiout, "]\n"); } @@ -196,7 +202,7 @@ switch (ecs->ws.kind) { case TARGET_WAITKIND_LOADED: -@@ -2665,11 +2676,12 @@ process_event_stop_test: +@@ -2651,11 +2662,12 @@ process_event_stop_test: static int currently_stepping (struct execution_control_state *ecs) { @@ -214,9 +220,11 @@ } /* Subroutine call with source code we should not step over. Do step ---- gdb-6.3/gdb/linux-nat.c.fix 2005-02-11 16:50:14.000000000 -0500 -+++ gdb-6.3/gdb/linux-nat.c 2005-02-11 17:02:54.000000000 -0500 -@@ -1032,17 +1032,20 @@ linux_nat_detach (char *args, int from_t +Index: gdb-6.5/gdb/linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/linux-nat.c 2006-07-07 02:24:51.000000000 -0300 ++++ gdb-6.5/gdb/linux-nat.c 2006-07-07 02:29:12.000000000 -0300 +@@ -1121,18 +1121,21 @@ linux_nat_detach (char *args, int from_t static int resume_callback (struct lwp_info *lp, void *data) { @@ -226,8 +234,9 @@ { struct thread_info *tp; -- child_resume (pid_to_ptid (GET_LWP (lp->ptid)), 0, TARGET_SIGNAL_0); -+ child_resume (pid_to_ptid (GET_LWP (lp->ptid)), step, TARGET_SIGNAL_0); + linux_ops->to_resume (pid_to_ptid (GET_LWP (lp->ptid)), +- 0, TARGET_SIGNAL_0); ++ step, TARGET_SIGNAL_0); if (debug_linux_nat) fprintf_unfiltered (gdb_stdlog, - "RC: PTRACE_CONT %s, 0, 0 (resume sibling)\n", @@ -240,11 +249,11 @@ } return 0; -@@ -1110,13 +1113,17 @@ linux_nat_resume (ptid_t ptid, int step, +@@ -1243,13 +1246,17 @@ linux_nat_resume (ptid_t ptid, int step, if (resume_all) iterate_over_lwps (resume_callback, NULL); -- child_resume (ptid, step, signo); +- linux_ops->to_resume (ptid, step, signo); - if (debug_linux_nat) - fprintf_unfiltered (gdb_stdlog, - "LLR: %s %s, %s (resume event thread)\n", @@ -253,10 +262,10 @@ - signo ? strsignal (signo) : "0"); + if (lp) + { -+ child_resume (ptid, step, signo); ++ linux_ops->to_resume (ptid, step, signo); + + if (debug_linux_nat) -+ fprintf_unfiltered (gdb_stdlog, ++ fprintf_unfiltered (gdb_stdlog, + "LLR: %s %s, %s (resume event thread)\n", + step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT", + target_pid_to_str (ptid), @@ -265,7 +274,7 @@ } /* Issue kill to specified lwp. */ -@@ -1826,7 +1833,7 @@ stop_and_resume_callback (struct lwp_inf +@@ -1840,7 +1847,7 @@ stop_and_resume_callback (struct lwp_inf for (ptr = lwp_list; ptr; ptr = ptr->next) if (lp == ptr) { @@ -274,7 +283,7 @@ resume_set_callback (lp, NULL); } } -@@ -1837,8 +1844,10 @@ static ptid_t +@@ -1851,8 +1858,10 @@ static ptid_t linux_nat_wait (ptid_t ptid, struct target_waitstatus *ourstatus) { struct lwp_info *lp = NULL; @@ -285,7 +294,7 @@ pid_t pid = PIDGET (ptid); sigset_t flush_mask; -@@ -1864,14 +1873,12 @@ retry: +@@ -1890,14 +1899,12 @@ retry: gets the expected trap so we don't want to wait on any LWP. This has ramifications when adjustment of the PC is required which can be different after a breakpoint vs a step (e.g. x86). */ @@ -303,7 +312,7 @@ } /* If any pid, check if there is a LWP with a wait status pending. */ -@@ -2134,8 +2141,9 @@ retry: +@@ -2130,8 +2137,9 @@ retry: } /* Make sure we don't report a SIGSTOP that we sent @@ -315,7 +324,7 @@ && WIFSTOPPED (status) && WSTOPSIG (status) == SIGSTOP) { if (debug_linux_nat) -@@ -2169,6 +2177,20 @@ retry: +@@ -2165,6 +2173,20 @@ retry: if (pid == -1) { @@ -379,7 +388,7 @@ /* Now stop all other LWP's ... */ iterate_over_lwps (stop_callback, NULL); -@@ -2278,6 +2336,10 @@ retry: +@@ -2275,6 +2333,10 @@ retry: else store_waitstatus (ourstatus, status); @@ -387,12 +396,14 @@ + if (step_lp && step_lp != lp) + ourstatus->step_thread_exit = 1; + - return (threaded ? lp->ptid : pid_to_ptid (GET_LWP (lp->ptid))); + return lp->ptid; } ---- gdb-6.3/gdb/target.h.fix 2005-02-11 16:50:19.000000000 -0500 -+++ gdb-6.3/gdb/target.h 2005-02-11 16:52:52.000000000 -0500 -@@ -134,6 +134,7 @@ enum target_waitkind +Index: gdb-6.5/gdb/target.h +=================================================================== +--- gdb-6.5.orig/gdb/target.h 2006-05-05 17:08:45.000000000 -0300 ++++ gdb-6.5/gdb/target.h 2006-07-07 02:26:54.000000000 -0300 +@@ -136,6 +136,7 @@ enum target_waitkind struct target_waitstatus { enum target_waitkind kind; diff --git a/gdb-6.3-terminal-fix-20050214.patch b/gdb-6.3-terminal-fix-20050214.patch index 9a0bf01..7aadb33 100644 --- a/gdb-6.3-terminal-fix-20050214.patch +++ b/gdb-6.3-terminal-fix-20050214.patch @@ -3,18 +3,11 @@ * top.c (gdb_readline_wrapper): Ensure terminal is gdb's before calling readline. ---- gdb-6.3/gdb/top.c.fix 2005-02-14 16:28:56.000000000 -0500 -+++ gdb-6.3/gdb/top.c 2005-02-14 16:30:20.000000000 -0500 -@@ -1,7 +1,7 @@ - /* Top level stuff for GDB, the GNU debugger. - - Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, -- 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -+ 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This file is part of GDB. -@@ -982,6 +982,14 @@ gdb_readline_wrapper (char *prompt) +Index: gdb-6.5/gdb/top.c +=================================================================== +--- gdb-6.5.orig/gdb/top.c 2006-03-29 19:53:33.000000000 -0300 ++++ gdb-6.5/gdb/top.c 2006-07-07 02:29:42.000000000 -0300 +@@ -728,6 +728,14 @@ gdb_readline_wrapper (char *prompt) after_char_processing_hook = NULL; } diff --git a/gdb-6.3-test-pie-20050107.patch b/gdb-6.3-test-pie-20050107.patch index 080e9bb..c6a5284 100644 --- a/gdb-6.3-test-pie-20050107.patch +++ b/gdb-6.3-test-pie-20050107.patch @@ -1,33 +1,38 @@ ---- gdb-6.3/gdb/testsuite/configure.in.fix Fri Jan 7 19:32:06 2005 -+++ gdb-6.3/gdb/testsuite/configure.in Fri Jan 7 19:33:29 2005 -@@ -123,4 +123,4 @@ AC_OUTPUT([Makefile \ - gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \ +Index: gdb-6.5/gdb/testsuite/configure.ac +=================================================================== +--- gdb-6.5.orig/gdb/testsuite/configure.ac 2006-07-07 01:12:31.000000000 -0300 ++++ gdb-6.5/gdb/testsuite/configure.ac 2006-07-07 01:13:23.000000000 -0300 +@@ -114,4 +114,4 @@ AC_OUTPUT([Makefile \ gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \ - gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile \ + gdb.fortran/Makefile gdb.server/Makefile \ + gdb.java/Makefile gdb.mi/Makefile \ - gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile]) + gdb.objc/Makefile gdb.pie/Makefile gdb.threads/Makefile gdb.trace/Makefile]) ---- gdb-6.3/gdb/testsuite/configure.fix Fri Jan 7 19:32:11 2005 -+++ gdb-6.3/gdb/testsuite/configure Fri Jan 7 19:33:54 2005 -@@ -1054,7 +1054,7 @@ trap 'rm -fr `echo "Makefile \ - gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \ - gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \ - gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile \ -- gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -+ gdb.objc/Makefile gdb.pie/Makefile gdb.threads/Makefile gdb.trace/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 - EOF - cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then ---- gdb-6.3/gdb/testsuite/gdb.pie/attach.c.fix Fri Jan 7 19:35:04 2005 -+++ gdb-6.3/gdb/testsuite/gdb.pie/attach.c Fri Jan 7 19:32:33 2005 + + +- ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile" ++ ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.pie/Makefile gdb.threads/Makefile gdb.trace/Makefile" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -3639,6 +3639,7 @@ do + "gdb.java/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.java/Makefile" ;; + "gdb.mi/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.mi/Makefile" ;; + "gdb.objc/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.objc/Makefile" ;; ++ "gdb.pie/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.pie/Makefile" ;; + "gdb.threads/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.threads/Makefile" ;; + "gdb.trace/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.trace/Makefile" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +Index: gdb-6.5/gdb/testsuite/gdb.pie/attach.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.pie/attach.c 2006-07-07 01:13:23.000000000 -0300 @@ -0,0 +1,20 @@ +/* This program is intended to be started outside of gdb, and then + attached to by gdb. Thus, it simply spins in a loop. The loop @@ -49,8 +54,10 @@ + } + return 0; +} ---- gdb-6.3/gdb/testsuite/gdb.pie/attach2.c.fix Fri Jan 7 19:35:04 2005 -+++ gdb-6.3/gdb/testsuite/gdb.pie/attach2.c Fri Jan 7 19:32:33 2005 +Index: gdb-6.5/gdb/testsuite/gdb.pie/attach2.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.pie/attach2.c 2006-07-07 01:13:23.000000000 -0300 @@ -0,0 +1,24 @@ +/* This program is intended to be started outside of gdb, and then + attached to by gdb. Thus, it simply spins in a loop. The loop @@ -76,8 +83,10 @@ + } + return (0); +} ---- gdb-6.3/gdb/testsuite/gdb.pie/break.c.fix Fri Jan 7 19:35:04 2005 -+++ gdb-6.3/gdb/testsuite/gdb.pie/break.c Fri Jan 7 19:32:33 2005 +Index: gdb-6.5/gdb/testsuite/gdb.pie/break.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.pie/break.c 2006-07-07 01:13:23.000000000 -0300 @@ -0,0 +1,146 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -225,8 +234,10 @@ + } + return 0; +} ---- gdb-6.3/gdb/testsuite/gdb.pie/break1.c.fix Fri Jan 7 19:35:04 2005 -+++ gdb-6.3/gdb/testsuite/gdb.pie/break1.c Fri Jan 7 19:32:33 2005 +Index: gdb-6.5/gdb/testsuite/gdb.pie/break1.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.pie/break1.c 2006-07-07 01:13:23.000000000 -0300 @@ -0,0 +1,44 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -272,8 +283,10 @@ +void marker3 (a, b) char *a, *b; {} /* set breakpoint 18 here */ +void marker4 (d) long d; {} /* set breakpoint 13 here */ +#endif ---- gdb-6.3/gdb/testsuite/gdb.pie/coremaker.c.fix Fri Jan 7 19:35:04 2005 -+++ gdb-6.3/gdb/testsuite/gdb.pie/coremaker.c Fri Jan 7 19:32:33 2005 +Index: gdb-6.5/gdb/testsuite/gdb.pie/coremaker.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.pie/coremaker.c 2006-07-07 01:13:23.000000000 -0300 @@ -0,0 +1,142 @@ +/* Copyright 1992, 1993, 1994, 1995, 1996, 1999 + Free Software Foundation, Inc. @@ -417,8 +430,10 @@ + return 0; +} + ---- gdb-6.3/gdb/testsuite/gdb.pie/attach.exp.fix Fri Jan 7 19:35:13 2005 -+++ gdb-6.3/gdb/testsuite/gdb.pie/attach.exp Fri Jan 7 19:32:33 2005 +Index: gdb-6.5/gdb/testsuite/gdb.pie/attach.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.pie/attach.exp 2006-07-07 01:13:23.000000000 -0300 @@ -0,0 +1,432 @@ +# Copyright 1997, 1999, 2002 Free Software Foundation, Inc. + @@ -852,8 +867,10 @@ +do_call_attach_tests + +return 0 ---- gdb-6.3/gdb/testsuite/gdb.pie/break.exp.fix Fri Jan 7 19:35:13 2005 -+++ gdb-6.3/gdb/testsuite/gdb.pie/break.exp Fri Jan 7 19:32:33 2005 +Index: gdb-6.5/gdb/testsuite/gdb.pie/break.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.pie/break.exp 2006-07-07 01:13:23.000000000 -0300 @@ -0,0 +1,973 @@ +# Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2002, 2003, 2004 @@ -1828,8 +1845,10 @@ + send_gdb "set args main\n" + gdb_expect -re ".*$gdb_prompt $" {} +} ---- gdb-6.3/gdb/testsuite/gdb.pie/corefile.exp.fix Fri Jan 7 19:35:13 2005 -+++ gdb-6.3/gdb/testsuite/gdb.pie/corefile.exp Fri Jan 7 19:32:33 2005 +Index: gdb-6.5/gdb/testsuite/gdb.pie/corefile.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.pie/corefile.exp 2006-07-07 01:13:23.000000000 -0300 @@ -0,0 +1,243 @@ +# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Free Software Foundation, Inc. @@ -2074,8 +2093,10 @@ +gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(\\).*" "up in corefile.exp (reinit)" + +gdb_test "core" "No core file now." ---- gdb-6.3/gdb/testsuite/gdb.pie/Makefile.in.fix Fri Jan 7 19:35:19 2005 -+++ gdb-6.3/gdb/testsuite/gdb.pie/Makefile.in Fri Jan 7 19:32:33 2005 +Index: gdb-6.5/gdb/testsuite/gdb.pie/Makefile.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.pie/Makefile.in 2006-07-07 01:13:23.000000000 -0300 @@ -0,0 +1,19 @@ +VPATH = @srcdir@ +srcdir = @srcdir@ diff --git a/gdb-6.3-threaded-watchpoints-20041213.patch b/gdb-6.3-threaded-watchpoints-20041213.patch index 74abf64..dea26cb 100644 --- a/gdb-6.3-threaded-watchpoints-20041213.patch +++ b/gdb-6.3-threaded-watchpoints-20041213.patch @@ -1,19 +1,17 @@ 2004-12-13 Jeff Johnston - * linux-nat.c: Add latest vfork fixes. - (stop_wait_callback, linux-nat-wait): Notify observers of a sigtrap. + * linux-nat.c: (stop_wait_callback, linux-nat-wait): Notify + observers of a sigtrap. (delete_lwp): Free the saved_trap_data if present. * linux-nat.h (struct lwp_info): Add saved_trap_data field. (struct linux_watchpoint): New struct. - * thread-db.c: Add support to always keep lwp info in ptids. + * linux-thread-db.c: Add support to always keep lwp info in ptids. (attach_thread): Notify observers of a linux new thread. (thread_db_wait): Call check_event if SIGILL occurs. - * infrun.c: Add debug statement support. - (handle_inferior_event): For platforms that + * infrun.c: (handle_inferior_event): For platforms that hit watchpoints prior to the data write, mark the watchpoints so we know to check them after we step through the write. - k * breakpoint.c (bpstat_stop_status): Fix up watchpoint code. (insert_watchpoints_for_new_thread): New function. (mark_triggered_watchpoints): Ditto. @@ -27,18 +25,18 @@ * s390-nat.c: Ditto. * Makefile.in: Add observer.h and linux-nat.h to ia64-linux-nat.o and s390-nat.o. - * gdbarch.sh (single_step_through_delay): New directive. - * gdbarch.h: Regenerated. - * gdbarch.c: Ditto. * doc/observer.texi: Add two new observers for linux_new_thread and sigtrap. ---- gdb-6.3/gdb/doc/observer.texi.fix Fri Jan 7 16:59:57 2005 -+++ gdb-6.3/gdb/doc/observer.texi Fri Jan 7 17:04:07 2005 -@@ -95,3 +95,14 @@ inferior, and before any information on - The specified shared library has been discovered to be unloaded. +Index: gdb-6.5/gdb/doc/observer.texi +=================================================================== +--- gdb-6.5.orig/gdb/doc/observer.texi 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/doc/observer.texi 2006-07-11 02:29:49.000000000 -0300 +@@ -122,3 +122,13 @@ haven't been loaded yet. + @deftypefun void solib_unloaded (struct so_list *@var{solib}) + The shared library specified by @var{solib} has been unloaded. @end deftypefun - ++ +@deftypefun void linux_new_thread (ptid_t @var{ptid}) +A new linux thread described by @var{ptid} has been officially attached +to by gdb. @@ -48,303 +46,19 @@ +A low-level SIGTRAP has been discovered. This notification can be used to save +additional state necessary if the trap is deferred for later handling. +@end deftypefun -+ -+ ---- gdb-6.3/gdb/infrun.c.fix Fri Jan 7 16:55:54 2005 -+++ gdb-6.3/gdb/infrun.c Fri Jan 7 17:04:37 2005 -@@ -106,6 +106,8 @@ static ptid_t previous_inferior_ptid; - - static int may_follow_exec = MAY_FOLLOW_EXEC; - -+static int debug_infrun = 0; -+ - /* If the program uses ELF-style shared libraries, then calls to - functions in shared libraries go through stubs, which live in a - table called the PLT (Procedure Linkage Table). The first time the -@@ -161,16 +163,6 @@ static int may_follow_exec = MAY_FOLLOW_ - #define SOLIB_IN_DYNAMIC_LINKER(pid,pc) 0 - #endif - --/* On some systems, the PC may be left pointing at an instruction that won't -- actually be executed. This is usually indicated by a bit in the PSW. If -- we find ourselves in such a state, then we step the target beyond the -- nullified instruction before returning control to the user so as to avoid -- confusion. */ -- --#ifndef INSTRUCTION_NULLIFIED --#define INSTRUCTION_NULLIFIED 0 --#endif -- - /* We can't step off a permanent breakpoint in the ordinary way, because we - can't remove it. Instead, we have to advance the PC to the next - instruction. This macro should expand to a pointer to a function that -@@ -517,6 +509,9 @@ resume (int step, enum target_signal sig - struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0); - QUIT; - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: resume (step=%d, signal=%d)\n", step, sig); -+ - /* FIXME: calling breakpoint_here_p (read_pc ()) three times! */ - - -@@ -714,24 +709,17 @@ proceed (CORE_ADDR addr, enum target_sig - - if (addr == (CORE_ADDR) -1) - { -- /* If there is a breakpoint at the address we will resume at, -- step one instruction before inserting breakpoints -- so that we do not stop right away (and report a second -- hit at this breakpoint). */ -- - if (read_pc () == stop_pc && breakpoint_here_p (read_pc ())) -+ /* There is a breakpoint at the address we will resume at, -+ step one instruction before inserting breakpoints so that -+ we do not stop right away (and report a second hit at this -+ breakpoint). */ - oneproc = 1; -- --#ifndef STEP_SKIPS_DELAY --#define STEP_SKIPS_DELAY(pc) (0) --#define STEP_SKIPS_DELAY_P (0) --#endif -- /* Check breakpoint_here_p first, because breakpoint_here_p is fast -- (it just checks internal GDB data structures) and STEP_SKIPS_DELAY -- is slow (it needs to read memory from the target). */ -- if (STEP_SKIPS_DELAY_P -- && breakpoint_here_p (read_pc () + 4) -- && STEP_SKIPS_DELAY (read_pc ())) -+ else if (gdbarch_single_step_through_delay_p (current_gdbarch) -+ && gdbarch_single_step_through_delay (current_gdbarch, -+ get_current_frame ())) -+ /* We stepped onto an instruction that needs to be stepped -+ again before re-inserting the breakpoint, do so. */ - oneproc = 1; - } - else -@@ -739,6 +727,10 @@ proceed (CORE_ADDR addr, enum target_sig - write_pc (addr); - } - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: proceed (addr=0x%s, signal=%d, step=%d)\n", -+ paddr_nz (addr), siggnal, step); -+ - /* In a multi-threaded task we may select another thread - and then continue or step. - -@@ -878,7 +870,6 @@ enum infwait_states - { - infwait_normal_state, - infwait_thread_hop_state, -- infwait_nullified_state, - infwait_nonstep_watch_state - }; - -@@ -957,6 +948,9 @@ wait_for_inferior (void) - struct execution_control_state ecss; - struct execution_control_state *ecs; - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: wait_for_inferior\n"); -+ - old_cleanups = make_cleanup (delete_step_resume_breakpoint, - &step_resume_breakpoint); - -@@ -1241,6 +1235,8 @@ handle_inferior_event (struct execution_ - switch (ecs->infwait_state) - { - case infwait_thread_hop_state: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: infwait_thread_hop_state\n"); - /* Cancel the waiton_ptid. */ - ecs->waiton_ptid = pid_to_ptid (-1); - /* See comments where a TARGET_WAITKIND_SYSCALL_RETURN event -@@ -1254,6 +1250,8 @@ handle_inferior_event (struct execution_ - break; - - case infwait_normal_state: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: infwait_normal_state\n"); - /* See comments where a TARGET_WAITKIND_SYSCALL_RETURN event - is serviced in this loop, below. */ - if (ecs->enable_hw_watchpoints_after_wait) -@@ -1264,11 +1262,9 @@ handle_inferior_event (struct execution_ - stepped_after_stopped_by_watchpoint = 0; - break; - -- case infwait_nullified_state: -- stepped_after_stopped_by_watchpoint = 0; -- break; -- - case infwait_nonstep_watch_state: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: infwait_nonstep_watch_state\n"); - insert_breakpoints (); - - /* FIXME-maybe: is this cleaner than setting a flag? Does it -@@ -1303,6 +1299,8 @@ handle_inferior_event (struct execution_ - switch (ecs->ws.kind) - { - case TARGET_WAITKIND_LOADED: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: TARGET_WAITKIND_LOADED\n"); - /* Ignore gracefully during startup of the inferior, as it - might be the shell which has just loaded some objects, - otherwise add the symbols for the newly loaded objects. */ -@@ -1347,11 +1345,15 @@ handle_inferior_event (struct execution_ - return; - - case TARGET_WAITKIND_SPURIOUS: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: TARGET_WAITKIND_SPURIOUS\n"); - resume (0, TARGET_SIGNAL_0); - prepare_to_wait (ecs); - return; - - case TARGET_WAITKIND_EXITED: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: TARGET_WAITKIND_EXITED\n"); - target_terminal_ours (); /* Must do this before mourn anyway */ - print_stop_reason (EXITED, ecs->ws.value.integer); - -@@ -1368,6 +1370,8 @@ handle_inferior_event (struct execution_ - return; - - case TARGET_WAITKIND_SIGNALLED: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: TARGET_WAITKIND_SIGNALLED\n"); - stop_print_frame = 0; - stop_signal = ecs->ws.value.sig; - target_terminal_ours (); /* Must do this before mourn anyway */ -@@ -1388,6 +1392,8 @@ handle_inferior_event (struct execution_ - the above cases end in a continue or goto. */ - case TARGET_WAITKIND_FORKED: - case TARGET_WAITKIND_VFORKED: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: TARGET_WAITKIND_FORKED\n"); - stop_signal = TARGET_SIGNAL_TRAP; - pending_follow.kind = ecs->ws.kind; - -@@ -1410,6 +1416,8 @@ handle_inferior_event (struct execution_ - goto process_event_stop_test; - - case TARGET_WAITKIND_EXECD: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: TARGET_WAITKIND_EXECED\n"); - stop_signal = TARGET_SIGNAL_TRAP; - - /* NOTE drow/2002-12-05: This code should be pushed down into the -@@ -1477,6 +1485,8 @@ handle_inferior_event (struct execution_ - Also, be careful not to try to gather much state about a thread - that's in a syscall. It's frequently a losing proposition. */ - case TARGET_WAITKIND_SYSCALL_ENTRY: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: TARGET_WAITKIND_SYSCALL_ENTRY\n"); - number_of_threads_in_syscalls++; - if (number_of_threads_in_syscalls == 1) - { -@@ -1501,6 +1511,8 @@ handle_inferior_event (struct execution_ - here, which will be serviced immediately after the target - is waited on. */ - case TARGET_WAITKIND_SYSCALL_RETURN: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: TARGET_WAITKIND_SYSCALL_RETURN\n"); - target_resume (ecs->ptid, 1, TARGET_SIGNAL_0); - - if (number_of_threads_in_syscalls > 0) -@@ -1513,6 +1525,8 @@ handle_inferior_event (struct execution_ - return; - - case TARGET_WAITKIND_STOPPED: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: TARGET_WAITKIND_STOPPED\n"); - stop_signal = ecs->ws.value.sig; - break; - -@@ -1526,6 +1540,8 @@ handle_inferior_event (struct execution_ - circumstance is any event which the lower level knows will be - reported multiple times without an intervening resume. */ - case TARGET_WAITKIND_IGNORE: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: TARGET_WAITKIND_IGNORE\n"); - prepare_to_wait (ecs); - return; - } -@@ -1546,6 +1562,9 @@ handle_inferior_event (struct execution_ - - stop_pc = read_pc_pid (ecs->ptid); - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stop_pc = 0x%s\n", paddr_nz (stop_pc)); -+ - if (stepping_past_singlestep_breakpoint) - { - gdb_assert (SOFTWARE_SINGLE_STEP_P () -@@ -1560,6 +1579,8 @@ handle_inferior_event (struct execution_ - we could tell, but we can't reliably. */ - if (stop_signal == TARGET_SIGNAL_TRAP) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepping_past_singlestep_breakpoint\n"); - /* Pull the single step breakpoints out of the target. */ - SOFTWARE_SINGLE_STEP (0, 0); - singlestep_breakpoints_inserted_p = 0; -@@ -1616,6 +1637,9 @@ handle_inferior_event (struct execution_ - { - int remove_status; - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: thread_hop_needed\n"); -+ - /* Saw a breakpoint, but it was hit by the wrong thread. - Just continue. */ - -@@ -1681,6 +1705,9 @@ handle_inferior_event (struct execution_ - so, then switch to that thread. */ - if (!ptid_equal (ecs->ptid, inferior_ptid)) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: context switch\n"); -+ - context_switch (ecs); - - if (deprecated_context_hook) -@@ -1696,33 +1723,24 @@ handle_inferior_event (struct execution_ - singlestep_breakpoints_inserted_p = 0; - } - -- /* If PC is pointing at a nullified instruction, then step beyond -- it so that the user won't be confused when GDB appears to be ready -- to execute it. */ -- -- /* if (INSTRUCTION_NULLIFIED && currently_stepping (ecs)) */ -- if (INSTRUCTION_NULLIFIED) -- { -- registers_changed (); -- target_resume (ecs->ptid, 1, TARGET_SIGNAL_0); -- -- /* We may have received a signal that we want to pass to -- the inferior; therefore, we must not clobber the waitstatus -- in WS. */ -- -- ecs->infwait_state = infwait_nullified_state; -- ecs->waiton_ptid = ecs->ptid; -- ecs->wp = &(ecs->tmpstatus); -- prepare_to_wait (ecs); -- return; -- } -- - /* It may not be necessary to disable the watchpoint to stop over - it. For example, the PA can (with some kernel cooperation) +Index: gdb-6.5/gdb/infrun.c +=================================================================== +--- gdb-6.5.orig/gdb/infrun.c 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/infrun.c 2006-07-11 02:29:55.000000000 -0300 +@@ -1703,9 +1703,19 @@ handle_inferior_event (struct execution_ single step over a watchpoint without disabling the watchpoint. */ if (HAVE_STEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws)) { -- resume (1, 0); + CORE_ADDR addr = 0; + -+ if (debug_infrun) -+ printf_unfiltered ("infrun: STOPPED_BY_WATCHPOINT\n"); + if (debug_infrun) + fprintf_unfiltered (gdb_stdlog, "infrun: STOPPED_BY_WATCHPOINT\n"); +- resume (1, 0); + + target_stopped_data_address (¤t_target, &addr); + mark_triggered_watchpoints (addr); @@ -357,7 +71,7 @@ prepare_to_wait (ecs); return; } -@@ -1732,6 +1750,8 @@ handle_inferior_event (struct execution_ +@@ -1715,6 +1725,8 @@ handle_inferior_event (struct execution_ register or page protection watchpoint scheme need here? */ if (HAVE_NONSTEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws)) { @@ -366,7 +80,7 @@ /* At this point, we are stopped at an instruction which has attempted to write to a piece of memory under control of a watchpoint. The instruction hasn't actually executed -@@ -1739,15 +1759,15 @@ handle_inferior_event (struct execution_ +@@ -1722,15 +1734,12 @@ handle_inferior_event (struct execution_ now, we would get the old value, and therefore no change would seem to have occurred. @@ -383,17 +97,14 @@ + triggered watchpoints so that after we single step, + we will check for a value change. */ + -+ if (debug_infrun) -+ printf_unfiltered ("infrun: STOPPED_BY_WATCHPOINT\n"); -+ + target_stopped_data_address (¤t_target, &addr); + mark_triggered_watchpoints (addr); - remove_breakpoints (); - registers_changed (); -@@ -1781,6 +1801,41 @@ handle_inferior_event (struct execution_ - stopped_by_random_signal = 0; - breakpoints_failed = 0; + if (debug_infrun) + fprintf_unfiltered (gdb_stdlog, "infrun: STOPPED_BY_WATCHPOINT\n"); +@@ -1801,6 +1810,41 @@ handle_inferior_event (struct execution_ + } + } + if (stop_signal == TARGET_SIGNAL_TRAP + && trap_expected @@ -409,7 +120,7 @@ + = gdbarch_single_step_through_delay (current_gdbarch, + get_current_frame ()); + if (debug_infrun && step_through_delay) -+ printf_unfiltered ("infrun: step through delay\n"); ++ fprintf_unfiltered (gdb_stdlog, "infrun: step through delay\n"); + if (step_range_end == 0 && step_through_delay) + { + /* The user issued a continue when stopped at a breakpoint. @@ -433,364 +144,21 @@ /* Look at the cause of the stop, and decide what to do. The alternatives are: 1) break; to really stop and return to the debugger, -@@ -1809,6 +1864,8 @@ handle_inferior_event (struct execution_ - { - if (stop_signal == TARGET_SIGNAL_TRAP && stop_after_trap) +@@ -1852,6 +1896,8 @@ handle_inferior_event (struct execution_ + See more comments in inferior.h. */ + if (stop_soon == STOP_QUIETLY_NO_SIGSTOP) { + if (debug_infrun) -+ printf_unfiltered ("infrun: stopped\n"); - stop_print_frame = 0; ++ fprintf_unfiltered (gdb_stdlog, "infrun: quietly stopped\n"); stop_stepping (ecs); - return; -@@ -1818,6 +1875,8 @@ handle_inferior_event (struct execution_ - shared libraries hook functions. */ - if (stop_soon == STOP_QUIETLY) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: quietly stopped\n"); - stop_stepping (ecs); - return; - } -@@ -1837,7 +1896,11 @@ handle_inferior_event (struct execution_ - /* Don't even think about breakpoints if just proceeded over a - breakpoint. */ - if (stop_signal == TARGET_SIGNAL_TRAP && trap_expected) -- bpstat_clear (&stop_bpstat); -+ { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: trap expected\n"); -+ bpstat_clear (&stop_bpstat); -+ } - else - { - /* See if there is a breakpoint at the current PC. */ -@@ -1898,6 +1961,9 @@ process_event_stop_test: - /* Signal not for debugging purposes. */ - int printed = 0; - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: random signal %d\n", stop_signal); -+ - stopped_by_random_signal = 1; - - if (signal_print[stop_signal]) -@@ -1977,6 +2043,8 @@ process_event_stop_test: - /* If we hit the breakpoint at longjmp, disable it for the - duration of this command. Then, install a temporary - breakpoint at the target of the jmp_buf. */ -+ if (debug_infrun) -+ printf_unfiltered ("infrun: BPSTATE_WHAT_SET_LONGJMP_RESUME\n"); - disable_longjmp_breakpoint (); - remove_breakpoints (); - breakpoints_inserted = 0; -@@ -2000,6 +2068,8 @@ process_event_stop_test: - - case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME: - case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: BPSTATE_WHAT_CLEAR_LONGJMP_RESUME\n"); - remove_breakpoints (); - breakpoints_inserted = 0; - disable_longjmp_breakpoint (); -@@ -2009,6 +2079,8 @@ process_event_stop_test: - /* else fallthrough */ - - case BPSTAT_WHAT_SINGLE: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: BPSTATE_WHAT_SINGLE\n"); - if (breakpoints_inserted) - { - remove_breakpoints (); -@@ -2020,6 +2092,8 @@ process_event_stop_test: - break; - - case BPSTAT_WHAT_STOP_NOISY: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: BPSTATE_WHAT_STOP_NOISY\n"); - stop_print_frame = 1; - - /* We are about to nuke the step_resume_breakpointt via the -@@ -2029,6 +2103,8 @@ process_event_stop_test: - return; - - case BPSTAT_WHAT_STOP_SILENT: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: BPSTATE_WHAT_STOP_SILENT\n"); - stop_print_frame = 0; - - /* We are about to nuke the step_resume_breakpoin via the -@@ -2055,6 +2131,9 @@ process_event_stop_test: - step-resume bp, but it makes no effort to ensure that - the one deleted is the one currently stopped at. MVS */ - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: BPSTATE_WHAT_STEP_RESUME\n"); -+ - if (step_resume_breakpoint == NULL) - { - step_resume_breakpoint = -@@ -2076,6 +2155,8 @@ process_event_stop_test: - break; - - case BPSTAT_WHAT_THROUGH_SIGTRAMP: -+ if (debug_infrun) -+ printf_unfiltered ("infrun: BPSTATE_WHAT_THROUGH_SIGTRAMP\n"); - /* If were waiting for a trap, hitting the step_resume_break - doesn't count as getting it. */ - if (trap_expected) -@@ -2086,6 +2167,8 @@ process_event_stop_test: - case BPSTAT_WHAT_CHECK_SHLIBS_RESUME_FROM_HOOK: - #ifdef SOLIB_ADD - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: BPSTATE_WHAT_CHECK_SHLIBS\n"); - /* Remove breakpoints, we eventually want to step over the - shlib event breakpoint, and SOLIB_ADD might adjust - breakpoint addresses via breakpoint_re_set. */ -@@ -2198,11 +2281,15 @@ process_event_stop_test: - /* Have we reached our destination? If not, keep going. */ - if (SOLIB_IN_DYNAMIC_LINKER (PIDGET (ecs->ptid), stop_pc)) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepping in dynamic linker\n"); - ecs->another_trap = 1; - keep_going (ecs); - return; - } - #endif -+ if (debug_infrun) -+ printf_unfiltered ("infrun: step past dynamic linker\n"); - /* Else, stop and report the catchpoint(s) whose triggering - caused us to begin stepping. */ - ecs->stepping_through_solib_after_catch = 0; -@@ -2216,6 +2303,9 @@ process_event_stop_test: - - if (step_resume_breakpoint) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: step-resume breakpoint\n"); -+ - /* Having a step-resume breakpoint overrides anything - else having to do with stepping commands until - that breakpoint is reached. */ -@@ -2225,6 +2315,8 @@ process_event_stop_test: - - if (step_range_end == 0) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: no stepping, continue\n"); - /* Likewise if we aren't even stepping. */ - keep_going (ecs); - return; -@@ -2237,6 +2329,10 @@ process_event_stop_test: - within it! */ - if (stop_pc >= step_range_start && stop_pc < step_range_end) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepping inside range [0x%s-0x%s]\n", -+ paddr_nz (step_range_start), -+ paddr_nz (step_range_end)); - keep_going (ecs); - return; + if (stop_signal == TARGET_SIGNAL_STOP) + stop_signal = TARGET_SIGNAL_0; +Index: gdb-6.5/gdb/breakpoint.c +=================================================================== +--- gdb-6.5.orig/gdb/breakpoint.c 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/breakpoint.c 2006-07-11 02:29:50.000000000 -0300 +@@ -748,6 +748,90 @@ insert_catchpoint (struct ui_out *uo, vo } -@@ -2253,6 +2349,9 @@ process_event_stop_test: - CORE_ADDR pc_after_resolver = - gdbarch_skip_solib_resolver (current_gdbarch, stop_pc); - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepped into dynsym resolve code\n"); -+ - if (pc_after_resolver) - { - /* Set up a step-resume breakpoint at the address -@@ -2273,6 +2372,8 @@ process_event_stop_test: - || step_over_calls == STEP_OVER_ALL) - && get_frame_type (get_current_frame ()) == SIGTRAMP_FRAME) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepped into signal trampoline\n"); - /* The inferior, while doing a "step" or "next", has ended up in - a signal trampoline (either by a signal being delivered or by - the signal handler returning). Just single-step until the -@@ -2287,6 +2388,9 @@ process_event_stop_test: - /* It's a subroutine call. */ - CORE_ADDR real_stop_pc; - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepped into subroutine\n"); -+ - if ((step_over_calls == STEP_OVER_NONE) - || ((step_range_end == 1) - && in_prologue (prev_pc, ecs->stop_func_start))) -@@ -2303,27 +2407,6 @@ process_event_stop_test: - return; - } - --#ifdef DEPRECATED_IGNORE_HELPER_CALL -- /* On MIPS16, a function that returns a floating point value may -- call a library helper function to copy the return value to a -- floating point register. The DEPRECATED_IGNORE_HELPER_CALL -- macro returns non-zero if we should ignore (i.e. step over) -- this function call. */ -- /* FIXME: cagney/2004-07-21: These custom ``ignore frame when -- stepping'' function attributes (SIGTRAMP_FRAME, -- DEPRECATED_IGNORE_HELPER_CALL, SKIP_TRAMPOLINE_CODE, -- skip_language_trampoline frame, et.al.) need to be replaced -- with generic attributes bound to the frame's function. */ -- if (DEPRECATED_IGNORE_HELPER_CALL (stop_pc)) -- { -- /* We're doing a "next", set a breakpoint at callee's return -- address (the address at which the caller will -- resume). */ -- insert_step_resume_breakpoint_at_frame (get_prev_frame (get_current_frame ())); -- keep_going (ecs); -- return; -- } --#endif - if (step_over_calls == STEP_OVER_ALL) - { - /* We're doing a "next", set a breakpoint at callee's return -@@ -2398,6 +2481,9 @@ process_event_stop_test: - /* Determine where this trampoline returns. */ - CORE_ADDR real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc); - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepped into solib return tramp\n"); -+ - /* Only proceed through if we know where it's going. */ - if (real_stop_pc) - { -@@ -2426,6 +2512,9 @@ process_event_stop_test: - if (step_over_calls == STEP_OVER_UNDEBUGGABLE - && ecs->stop_func_name == NULL) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepped into undebuggable function\n"); -+ - /* The inferior just stepped into, or returned to, an - undebuggable function (where there is no symbol, not even a - minimal symbol, corresponding to the address where the -@@ -2456,6 +2545,8 @@ process_event_stop_test: - { - /* It is stepi or nexti. We always want to stop stepping after - one instruction. */ -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepi/nexti\n"); - stop_step = 1; - print_stop_reason (END_STEPPING_RANGE, 0); - stop_stepping (ecs); -@@ -2470,6 +2561,8 @@ process_event_stop_test: - stepping (does this always happen right after one instruction, - when we do "s" in a function with no line numbers, - or can this happen as a result of a return or longjmp?). */ -+ if (debug_infrun) -+ printf_unfiltered ("infrun: no line number info\n"); - stop_step = 1; - print_stop_reason (END_STEPPING_RANGE, 0); - stop_stepping (ecs); -@@ -2484,6 +2577,8 @@ process_event_stop_test: - we don't stop if we step into the middle of a different line. - That is said to make things like for (;;) statements work - better. */ -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepped to a different line\n"); - stop_step = 1; - print_stop_reason (END_STEPPING_RANGE, 0); - stop_stepping (ecs); -@@ -2504,6 +2599,8 @@ process_event_stop_test: - This is particularly necessary for a one-line function, - in which after skipping the prologue we better stop even though - we will be in mid-line. */ -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stepped to a different function\n"); - stop_step = 1; - print_stop_reason (END_STEPPING_RANGE, 0); - stop_stepping (ecs); -@@ -2540,6 +2637,8 @@ process_event_stop_test: - step_frame_id = current_frame; - } - -+ if (debug_infrun) -+ printf_unfiltered ("infrun: keep going\n"); - keep_going (ecs); - } - -@@ -2676,6 +2775,9 @@ insert_step_resume_breakpoint_at_frame ( - static void - stop_stepping (struct execution_control_state *ecs) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: stop_stepping\n"); -+ - /* Let callers know we don't want to wait for the inferior anymore. */ - ecs->wait_some_more = 0; - } -@@ -2753,6 +2855,8 @@ keep_going (struct execution_control_sta - static void - prepare_to_wait (struct execution_control_state *ecs) - { -+ if (debug_infrun) -+ printf_unfiltered ("infrun: prepare_to_wait\n"); - if (ecs->infwait_state == infwait_normal_state) - { - overlay_cache_invalid = 1; -@@ -3790,6 +3894,10 @@ Pass and Stop may be combined.", NULL)); - This allows you to set a list of commands to be run each time execution\n\ - of the program stops.", &cmdlist); - -+ add_set_cmd ("infrun", class_maintenance, var_zinteger, -+ &debug_infrun, "Set inferior debugging.\n\ -+When non-zero, inferior specific debugging is enabled.", &setdebuglist); -+ - numsigs = (int) TARGET_SIGNAL_LAST; - signal_stop = (unsigned char *) xmalloc (sizeof (signal_stop[0]) * numsigs); - signal_print = (unsigned char *) ---- gdb-6.3/gdb/gdbarch.h.fix Fri Jan 7 17:08:19 2005 -+++ gdb-6.3/gdb/gdbarch.h Fri Jan 7 17:09:12 2005 -@@ -1218,6 +1218,15 @@ extern void set_gdbarch_software_single_ - #define SOFTWARE_SINGLE_STEP(sig, insert_breakpoints_p) (gdbarch_software_single_step (current_gdbarch, sig, insert_breakpoints_p)) - #endif - -+/* Return non-zero if the processor is executing a delay slot and a -+ * further single-step is needed before the instruction finishes. */ -+ -+extern int gdbarch_single_step_through_delay_p (struct gdbarch *gdbarch); -+ -+typedef int (gdbarch_single_step_through_delay_ftype) (struct gdbarch *gdbarch, struct frame_info *frame); -+extern int gdbarch_single_step_through_delay (struct gdbarch *gdbarch, struct frame_info *frame); -+extern void set_gdbarch_single_step_through_delay (struct gdbarch *gdbarch, gdbarch_single_step_through_delay_ftype *single_step_through_delay); -+ - /* FIXME: cagney/2003-08-28: Need to find a better way of selecting the - disassembler. Perhaps objdump can handle it? */ - ---- gdb-6.3/gdb/breakpoint.c.fix Fri Jan 7 16:58:12 2005 -+++ gdb-6.3/gdb/breakpoint.c Fri Jan 7 17:04:07 2005 -@@ -86,11 +86,6 @@ static void watch_command (char *, int); - - static int can_use_hardware_watchpoint (struct value *); - --extern void break_at_finish_command (char *, int); --extern void break_at_finish_at_depth_command (char *, int); -- --extern void tbreak_at_finish_command (char *, int); -- - static int break_command_1 (char *, int, int, struct breakpoint *); - - static void mention (struct breakpoint *); -@@ -181,11 +176,6 @@ static void create_fork_vfork_event_catc - char *cond_string, - enum bptype bp_kind); - --static void break_at_finish_at_depth_command_1 (char *arg, -- int flag, int from_tty); -- --static void break_at_finish_command_1 (char *arg, int flag, int from_tty); -- - static void stop_command (char *arg, int from_tty); - - static void stopin_command (char *arg, int from_tty); -@@ -748,6 +738,90 @@ insert_catchpoint (struct ui_out *uo, vo - return 0; } +/* External function to insert all existing watchpoints on a newly @@ -880,7 +248,7 @@ /* Helper routine: free the value chain for a breakpoint (watchpoint). */ static void free_valchain (struct bp_location *b) -@@ -1179,6 +1253,7 @@ remove_breakpoints (void) +@@ -1190,6 +1274,7 @@ remove_breakpoints (void) { struct bp_location *b; int val; @@ -888,7 +256,7 @@ ALL_BP_LOCATIONS (b) { -@@ -1186,10 +1261,10 @@ remove_breakpoints (void) +@@ -1197,10 +1282,10 @@ remove_breakpoints (void) { val = remove_breakpoint (b, mark_uninserted); if (val != 0) @@ -901,7 +269,7 @@ } int -@@ -2122,8 +2197,13 @@ print_it_typical (bpstat bs) +@@ -2126,8 +2211,13 @@ print_it_typical (bpstat bs) break; case bp_thread_event: @@ -914,10 +282,10 @@ + if (bs->next) + return PRINT_UNKNOWN; + - printf_filtered ("Thread Event Breakpoint: gdb should not stop!\n"); + printf_filtered (_("Thread Event Breakpoint: gdb should not stop!\n")); return PRINT_NOTHING; break; -@@ -2560,6 +2640,54 @@ which its expression is valid.\n"); +@@ -2567,6 +2657,54 @@ which its expression is valid.\n"); } } @@ -972,7 +340,7 @@ /* Get a bpstat associated with having just stopped at address BP_ADDR in thread PTID. STOPPED_BY_WATCHPOINT is 1 if the target thinks we stopped due to a hardware watchpoint, 0 if we -@@ -2690,82 +2818,61 @@ bpstat_stop_status (CORE_ADDR bp_addr, p +@@ -2697,82 +2835,61 @@ bpstat_stop_status (CORE_ADDR bp_addr, p bs->stop = 1; bs->print = 1; @@ -1009,7 +377,7 @@ - /* FALLTHROUGH */ - case 0: - /* Error from catch_errors. */ -- printf_filtered ("Watchpoint %d deleted.\n", b->number); +- printf_filtered (_("Watchpoint %d deleted.\n"), b->number); - if (b->related_breakpoint) - b->related_breakpoint->disposition = disp_del_at_next_stop; - b->disposition = disp_del_at_next_stop; @@ -1034,14 +402,14 @@ - if (!target_stopped_data_address (¤t_target, &addr)) - continue; -- for (v = b->val_chain; v; v = v->next) -+ if (b->type == bp_watchpoint +- for (v = b->val_chain; v; v = value_next (v)) ++ if (b->type == bp_watchpoint + || b->watchpoint_triggered + || (b->type == bp_hardware_watchpoint + && !target_stopped_data_address_p (¤t_target))) { - if (VALUE_LVAL (v) == lval_memory -- && ! VALUE_LAZY (v)) +- && ! value_lazy (v)) + /* We either have a software watchpoint, a triggered watchpoint + which we have stepped over, or we cannot ascertain what data + address causes a write watchpoint. In all these @@ -1055,7 +423,7 @@ + we have a read or access watchpoint and have no alternatives. */ + if (!target_stopped_data_address (¤t_target, &addr)) { -- struct type *vtype = check_typedef (VALUE_TYPE (v)); +- struct type *vtype = check_typedef (value_type (v)); - - if (v == b->val_chain - || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT @@ -1071,11 +439,11 @@ { - CORE_ADDR vaddr; - -- vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v); +- vaddr = VALUE_ADDRESS (v) + value_offset (v); - /* Exact match not required. Within range is - sufficient. */ - if (addr >= vaddr && -- addr < vaddr + TYPE_LENGTH (VALUE_TYPE (v))) +- addr < vaddr + TYPE_LENGTH (value_type (v))) - found = 1; + struct type *vtype = check_typedef (VALUE_TYPE (v)); + @@ -1096,11 +464,11 @@ } } - if (found) -+ if (must_check_value) ++ if (must_check_value) { char *message = xstrprintf ("Error evaluating expression for watchpoint %d\n", b->number); -@@ -2794,6 +2901,15 @@ bpstat_stop_status (CORE_ADDR bp_addr, p +@@ -2801,6 +2918,15 @@ bpstat_stop_status (CORE_ADDR bp_addr, p break; case WP_VALUE_NOT_CHANGED: /* Stop. */ @@ -1116,7 +484,7 @@ ++(b->hit_count); break; default: -@@ -2809,7 +2925,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p +@@ -2816,7 +2942,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p break; } } @@ -1125,7 +493,7 @@ { /* This is a case where some watchpoint(s) triggered, but not at the address of this watchpoint (FOUND -@@ -4091,6 +4207,7 @@ set_raw_breakpoint (struct symtab_and_li +@@ -4112,6 +4238,7 @@ set_raw_breakpoint (struct symtab_and_li b->exec_pathname = NULL; b->ops = NULL; b->pending = 0; @@ -1133,279 +501,11 @@ /* Add this breakpoint to the end of the chain so that a list of breakpoints will come out in order -@@ -5449,169 +5566,6 @@ gdb_breakpoint (char *address, char *con - } - - --static void --break_at_finish_at_depth_command_1 (char *arg, int flag, int from_tty) --{ -- struct frame_info *frame; -- CORE_ADDR low, high, selected_pc = 0; -- char *extra_args = NULL; -- char *level_arg; -- int extra_args_len = 0, if_arg = 0; -- -- if (!arg || -- (arg[0] == 'i' && arg[1] == 'f' && (arg[2] == ' ' || arg[2] == '\t'))) -- { -- -- if (default_breakpoint_valid) -- { -- if (deprecated_selected_frame) -- { -- selected_pc = get_frame_pc (deprecated_selected_frame); -- if (arg) -- if_arg = 1; -- } -- else -- error ("No selected frame."); -- } -- else -- error ("No default breakpoint address now."); -- } -- else -- { -- extra_args = strchr (arg, ' '); -- if (extra_args) -- { -- extra_args++; -- extra_args_len = strlen (extra_args); -- level_arg = (char *) xmalloc (extra_args - arg); -- strncpy (level_arg, arg, extra_args - arg - 1); -- level_arg[extra_args - arg - 1] = '\0'; -- } -- else -- { -- level_arg = (char *) xmalloc (strlen (arg) + 1); -- strcpy (level_arg, arg); -- } -- -- frame = parse_frame_specification (level_arg); -- if (frame) -- selected_pc = get_frame_pc (frame); -- else -- selected_pc = 0; -- } -- if (if_arg) -- { -- extra_args = arg; -- extra_args_len = strlen (arg); -- } -- -- if (selected_pc) -- { -- if (find_pc_partial_function (selected_pc, (char **) NULL, &low, &high)) -- { -- char *addr_string; -- if (extra_args_len) -- addr_string = xstrprintf ("*0x%s %s", paddr_nz (high), extra_args); -- else -- addr_string = xstrprintf ("*0x%s", paddr_nz (high)); -- break_command_1 (addr_string, flag, from_tty, NULL); -- xfree (addr_string); -- } -- else -- error ("No function contains the specified address"); -- } -- else -- error ("Unable to set breakpoint at procedure exit"); --} -- -- --static void --break_at_finish_command_1 (char *arg, int flag, int from_tty) --{ -- char *addr_string, *break_string, *beg_addr_string; -- CORE_ADDR low, high; -- struct symtabs_and_lines sals; -- struct symtab_and_line sal; -- struct cleanup *old_chain; -- char *extra_args = NULL; -- int extra_args_len = 0; -- int i, if_arg = 0; -- -- if (!arg || -- (arg[0] == 'i' && arg[1] == 'f' && (arg[2] == ' ' || arg[2] == '\t'))) -- { -- if (default_breakpoint_valid) -- { -- if (deprecated_selected_frame) -- { -- addr_string = xstrprintf ("*0x%s", -- paddr_nz (get_frame_pc (deprecated_selected_frame))); -- if (arg) -- if_arg = 1; -- } -- else -- error ("No selected frame."); -- } -- else -- error ("No default breakpoint address now."); -- } -- else -- { -- addr_string = (char *) xmalloc (strlen (arg) + 1); -- strcpy (addr_string, arg); -- } -- -- if (if_arg) -- { -- extra_args = arg; -- extra_args_len = strlen (arg); -- } -- else if (arg) -- { -- /* get the stuff after the function name or address */ -- extra_args = strchr (arg, ' '); -- if (extra_args) -- { -- extra_args++; -- extra_args_len = strlen (extra_args); -- } -- } -- -- sals.sals = NULL; -- sals.nelts = 0; -- -- beg_addr_string = addr_string; -- sals = decode_line_1 (&addr_string, 1, (struct symtab *) NULL, 0, -- (char ***) NULL, NULL); -- -- xfree (beg_addr_string); -- old_chain = make_cleanup (xfree, sals.sals); -- for (i = 0; (i < sals.nelts); i++) -- { -- sal = sals.sals[i]; -- if (find_pc_partial_function (sal.pc, (char **) NULL, &low, &high)) -- { -- break_string; -- if (extra_args_len) -- break_string = xstrprintf ("*0x%s %s", paddr_nz (high), -- extra_args); -- else -- break_string = xstrprintf ("*0x%s", paddr_nz (high)); -- break_command_1 (break_string, flag, from_tty, NULL); -- xfree (break_string); -- } -- else -- error ("No function contains the specified address"); -- } -- if (sals.nelts > 1) -- { -- warning ("Multiple breakpoints were set.\n"); -- warning ("Use the \"delete\" command to delete unwanted breakpoints."); -- } -- do_cleanups (old_chain); --} -- -- - /* Helper function for break_command_1 and disassemble_command. */ - - void -@@ -5668,29 +5622,11 @@ break_command (char *arg, int from_tty) - } - - void --break_at_finish_command (char *arg, int from_tty) --{ -- break_at_finish_command_1 (arg, 0, from_tty); --} -- --void --break_at_finish_at_depth_command (char *arg, int from_tty) --{ -- break_at_finish_at_depth_command_1 (arg, 0, from_tty); --} -- --void - tbreak_command (char *arg, int from_tty) - { - break_command_1 (arg, BP_TEMPFLAG, from_tty, NULL); - } - --void --tbreak_at_finish_command (char *arg, int from_tty) --{ -- break_at_finish_command_1 (arg, BP_TEMPFLAG, from_tty); --} -- - static void - hbreak_command (char *arg, int from_tty) - { ---- gdb-6.3/gdb/gdbarch.c.fix Fri Jan 7 17:09:18 2005 -+++ gdb-6.3/gdb/gdbarch.c Fri Jan 7 17:36:36 2005 -@@ -211,6 +211,7 @@ struct gdbarch - gdbarch_addr_bits_remove_ftype *addr_bits_remove; - gdbarch_smash_text_address_ftype *smash_text_address; - gdbarch_software_single_step_ftype *software_single_step; -+ gdbarch_single_step_through_delay_ftype *single_step_through_delay; - gdbarch_print_insn_ftype *print_insn; - gdbarch_skip_trampoline_code_ftype *skip_trampoline_code; - gdbarch_skip_solib_resolver_ftype *skip_solib_resolver; -@@ -337,6 +338,7 @@ struct gdbarch startup_gdbarch = - 0, /* addr_bits_remove */ - 0, /* smash_text_address */ - 0, /* software_single_step */ -+ 0, /* single_step_through_delay */ - 0, /* print_insn */ - 0, /* skip_trampoline_code */ - generic_skip_solib_resolver, /* skip_solib_resolver */ -@@ -591,6 +593,7 @@ verify_gdbarch (struct gdbarch *current_ - /* Skip verify of addr_bits_remove, invalid_p == 0 */ - /* Skip verify of smash_text_address, invalid_p == 0 */ - /* Skip verify of software_single_step, has predicate */ -+ /* Skip verify of single_step_through_delay, has predicate */ - if (current_gdbarch->print_insn == 0) - fprintf_unfiltered (log, "\n\tprint_insn"); - /* Skip verify of skip_trampoline_code, invalid_p == 0 */ -@@ -1516,6 +1519,12 @@ gdbarch_dump (struct gdbarch *current_gd - fprintf_unfiltered (file, - "gdbarch_dump: short_bit = %s\n", - paddr_d (current_gdbarch->short_bit)); -+ fprintf_unfiltered (file, -+ "gdbarch_dump: gdbarch_single_step_through_delay_p() = %d\n", -+ gdbarch_single_step_through_delay_p (current_gdbarch)); -+ fprintf_unfiltered (file, -+ "gdbarch_dump: single_step_through_delay = <0x%lx>\n", -+ (long) current_gdbarch->single_step_through_delay); - #ifdef SKIP_PROLOGUE - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", -@@ -3346,6 +3355,30 @@ set_gdbarch_software_single_step (struct - } - - int -+gdbarch_single_step_through_delay_p (struct gdbarch *gdbarch) -+{ -+ gdb_assert (gdbarch != NULL); -+ return gdbarch->single_step_through_delay != NULL; -+} -+ -+int -+gdbarch_single_step_through_delay (struct gdbarch *gdbarch, struct frame_info *frame) -+{ -+ gdb_assert (gdbarch != NULL); -+ gdb_assert (gdbarch->single_step_through_delay != NULL); -+ if (gdbarch_debug >= 2) -+ fprintf_unfiltered (gdb_stdlog, "gdbarch_single_step_through_delay called\n"); -+ return gdbarch->single_step_through_delay (gdbarch, frame); -+} -+ -+void -+set_gdbarch_single_step_through_delay (struct gdbarch *gdbarch, -+ gdbarch_single_step_through_delay_ftype single_step_through_delay) -+{ -+ gdbarch->single_step_through_delay = single_step_through_delay; -+} -+ -+int - gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, struct disassemble_info *info) - { - gdb_assert (gdbarch != NULL); ---- gdb-6.3/gdb/breakpoint.h.fix Fri Jan 7 16:58:19 2005 -+++ gdb-6.3/gdb/breakpoint.h Fri Jan 7 17:04:07 2005 -@@ -397,6 +397,11 @@ struct breakpoint +Index: gdb-6.5/gdb/breakpoint.h +=================================================================== +--- gdb-6.5.orig/gdb/breakpoint.h 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/breakpoint.h 2006-07-11 02:29:49.000000000 -0300 +@@ -426,6 +426,11 @@ struct breakpoint /* Is breakpoint pending on shlib loads? */ int pending; @@ -1417,7 +517,7 @@ }; /* The following stuff is an abstract data type "bpstat" ("breakpoint -@@ -663,6 +668,14 @@ extern void tbreak_command (char *, int) +@@ -692,6 +697,14 @@ extern void tbreak_command (char *, int) extern int insert_breakpoints (void); @@ -1432,244 +532,19 @@ extern int remove_breakpoints (void); /* This function can be used to physically insert eventpoints from the ---- gdb-6.3/gdb/linux-nat.c.fix Fri Jan 7 16:58:27 2005 -+++ gdb-6.3/gdb/linux-nat.c Fri Jan 7 17:04:07 2005 -@@ -34,6 +34,7 @@ +Index: gdb-6.5/gdb/linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/linux-nat.c 2006-07-07 04:24:57.000000000 -0300 ++++ gdb-6.5/gdb/linux-nat.c 2006-07-11 02:29:49.000000000 -0300 +@@ -36,6 +36,7 @@ #include "gdbthread.h" #include "gdbcmd.h" #include "regcache.h" +#include "observer.h" - #include /* for MAXPATHLEN */ - #include /* for elf_gregset etc. */ - #include "elf-bfd.h" /* for elfcore_write_* */ -@@ -69,7 +70,7 @@ - #define PTRACE_EVENT_VFORK 2 - #define PTRACE_EVENT_CLONE 3 - #define PTRACE_EVENT_EXEC 4 --#define PTRACE_EVENT_VFORKDONE 5 -+#define PTRACE_EVENT_VFORK_DONE 5 - #define PTRACE_EVENT_EXIT 6 - - #endif /* PTRACE_EVENT_FORK */ -@@ -147,21 +148,50 @@ linux_tracefork_child (void) - ptrace (PTRACE_TRACEME, 0, 0, 0); - kill (getpid (), SIGSTOP); - fork (); -- exit (0); -+ _exit (0); - } - --/* Determine if PTRACE_O_TRACEFORK can be used to follow fork events. We -+/* Wrapper function for waitpid which handles EINTR. */ -+ -+static int -+my_waitpid (int pid, int *status, int flags) -+{ -+ int ret; -+ do -+ { -+ ret = waitpid (pid, status, flags); -+ } -+ while (ret == -1 && errno == EINTR); -+ -+ return ret; -+} -+ -+/* Determine if PTRACE_O_TRACEFORK can be used to follow fork events. -+ -+ First, we try to enable fork tracing on ORIGINAL_PID. If this fails, -+ we know that the feature is not available. This may change the tracing -+ options for ORIGINAL_PID, but we'll be setting them shortly anyway. -+ -+ However, if it succeeds, we don't know for sure that the feature is -+ available; old versions of PTRACE_SETOPTIONS ignored unknown options. We - create a child process, attach to it, use PTRACE_SETOPTIONS to enable -- fork tracing, and let it fork. If the process exits, we assume that -- we can't use TRACEFORK; if we get the fork notification, and we can -- extract the new child's PID, then we assume that we can. */ -+ fork tracing, and let it fork. If the process exits, we assume that we -+ can't use TRACEFORK; if we get the fork notification, and we can extract -+ the new child's PID, then we assume that we can. */ - - static void --linux_test_for_tracefork (void) -+linux_test_for_tracefork (int original_pid) - { - int child_pid, ret, status; - long second_pid; - -+ linux_supports_tracefork_flag = 0; -+ linux_supports_tracevforkdone_flag = 0; -+ -+ ret = ptrace (PTRACE_SETOPTIONS, original_pid, 0, PTRACE_O_TRACEFORK); -+ if (ret != 0) -+ return; -+ - child_pid = fork (); - if (child_pid == -1) - perror_with_name ("linux_test_for_tracefork: fork"); -@@ -169,7 +199,7 @@ linux_test_for_tracefork (void) - if (child_pid == 0) - linux_tracefork_child (); - -- ret = waitpid (child_pid, &status, 0); -+ ret = my_waitpid (child_pid, &status, 0); - if (ret == -1) - perror_with_name ("linux_test_for_tracefork: waitpid"); - else if (ret != child_pid) -@@ -177,13 +207,23 @@ linux_test_for_tracefork (void) - if (! WIFSTOPPED (status)) - error ("linux_test_for_tracefork: waitpid: unexpected status %d.", status); - -- linux_supports_tracefork_flag = 0; -- - ret = ptrace (PTRACE_SETOPTIONS, child_pid, 0, PTRACE_O_TRACEFORK); - if (ret != 0) - { -- ptrace (PTRACE_KILL, child_pid, 0, 0); -- waitpid (child_pid, &status, 0); -+ ret = ptrace (PTRACE_KILL, child_pid, 0, 0); -+ if (ret != 0) -+ { -+ warning ("linux_test_for_tracefork: failed to kill child"); -+ return; -+ } -+ -+ ret = my_waitpid (child_pid, &status, 0); -+ if (ret != child_pid) -+ warning ("linux_test_for_tracefork: failed to wait for killed child"); -+ else if (!WIFSIGNALED (status)) -+ warning ("linux_test_for_tracefork: unexpected wait status 0x%x from " -+ "killed child", status); -+ - return; - } - -@@ -192,8 +232,12 @@ linux_test_for_tracefork (void) - PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORKDONE); - linux_supports_tracevforkdone_flag = (ret == 0); - -- ptrace (PTRACE_CONT, child_pid, 0, 0); -- ret = waitpid (child_pid, &status, 0); -+ ret = ptrace (PTRACE_CONT, child_pid, 0, 0); -+ if (ret != 0) -+ warning ("linux_test_for_tracefork: failed to resume child"); -+ -+ ret = my_waitpid (child_pid, &status, 0); -+ - if (ret == child_pid && WIFSTOPPED (status) - && status >> 16 == PTRACE_EVENT_FORK) - { -@@ -204,34 +248,38 @@ linux_test_for_tracefork (void) - int second_status; - - linux_supports_tracefork_flag = 1; -- waitpid (second_pid, &second_status, 0); -- ptrace (PTRACE_DETACH, second_pid, 0, 0); -+ my_waitpid (second_pid, &second_status, 0); -+ ret = ptrace (PTRACE_KILL, second_pid, 0, 0); -+ if (ret != 0) -+ warning ("linux_test_for_tracefork: failed to kill second child"); - } - } -+ else -+ warning ("linux_test_for_tracefork: unexpected result from waitpid " -+ "(%d, status 0x%x)", ret, status); - -- if (WIFSTOPPED (status)) -- { -- ptrace (PTRACE_DETACH, child_pid, 0, 0); -- waitpid (child_pid, &status, 0); -- } -+ ret = ptrace (PTRACE_KILL, child_pid, 0, 0); -+ if (ret != 0) -+ warning ("linux_test_for_tracefork: failed to kill child"); -+ my_waitpid (child_pid, &status, 0); - } - - /* Return non-zero iff we have tracefork functionality available. - This function also sets linux_supports_tracefork_flag. */ - - static int --linux_supports_tracefork (void) -+linux_supports_tracefork (int pid) - { - if (linux_supports_tracefork_flag == -1) -- linux_test_for_tracefork (); -+ linux_test_for_tracefork (pid); - return linux_supports_tracefork_flag; - } - - static int --linux_supports_tracevforkdone (void) -+linux_supports_tracevforkdone (int pid) - { - if (linux_supports_tracefork_flag == -1) -- linux_test_for_tracefork (); -+ linux_test_for_tracefork (pid); - return linux_supports_tracevforkdone_flag; - } - -@@ -242,12 +290,12 @@ linux_enable_event_reporting (ptid_t pti - int pid = ptid_get_pid (ptid); - int options; - -- if (! linux_supports_tracefork ()) -+ if (! linux_supports_tracefork (pid)) - return; - - options = PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORK | PTRACE_O_TRACEEXEC - | PTRACE_O_TRACECLONE; -- if (linux_supports_tracevforkdone ()) -+ if (linux_supports_tracevforkdone (pid)) - options |= PTRACE_O_TRACEVFORKDONE; - - /* Do not enable PTRACE_O_TRACEEXIT until GDB is more prepared to support -@@ -308,13 +356,14 @@ child_follow_fork (int follow_child) - - if (has_vforked) - { -- if (linux_supports_tracevforkdone ()) -+ gdb_assert (linux_supports_tracefork_flag >= 0); -+ if (linux_supports_tracevforkdone (0)) - { - int status; - - ptrace (PTRACE_CONT, parent_pid, 0, 0); - waitpid (parent_pid, &status, __WALL); -- if ((status >> 16) != PTRACE_EVENT_VFORKDONE) -+ if ((status >> 16) != PTRACE_EVENT_VFORK_DONE) - warning ("Unexpected waitpid result %06x when waiting for " - "vfork-done", status); - } -@@ -476,7 +525,7 @@ linux_handle_extended_wait (int pid, int - int - child_insert_fork_catchpoint (int pid) - { -- if (! linux_supports_tracefork ()) -+ if (! linux_supports_tracefork (pid)) - error ("Your system does not support fork catchpoints."); - - return 0; -@@ -485,7 +534,7 @@ child_insert_fork_catchpoint (int pid) - int - child_insert_vfork_catchpoint (int pid) - { -- if (!linux_supports_tracefork ()) -+ if (!linux_supports_tracefork (pid)) - error ("Your system does not support vfork catchpoints."); - - return 0; -@@ -494,7 +543,7 @@ child_insert_vfork_catchpoint (int pid) - int - child_insert_exec_catchpoint (int pid) - { -- if (!linux_supports_tracefork ()) -+ if (!linux_supports_tracefork (pid)) - error ("Your system does not support exec catchpoints."); - - return 0; -@@ -716,6 +765,9 @@ delete_lwp (ptid_t ptid) + #include "regset.h" + #include "inf-ptrace.h" + #include "auxv.h" +@@ -764,6 +765,9 @@ delete_lwp (ptid_t ptid) else lwp_list = lp->next; @@ -1679,7 +554,7 @@ xfree (lp); } -@@ -1285,6 +1337,13 @@ stop_wait_callback (struct lwp_info *lp, +@@ -1478,6 +1482,13 @@ stop_wait_callback (struct lwp_info *lp, user will delete or disable the breakpoint, but the thread will have already tripped on it. */ @@ -1693,8 +568,8 @@ /* Now resume this LWP and get the SIGSTOP event. */ errno = 0; ptrace (PTRACE_CONT, GET_LWP (lp->ptid), 0, 0); -@@ -1960,6 +2019,14 @@ retry: - } +@@ -2054,6 +2065,14 @@ retry: + target_pid_to_str (lp->ptid)); } + /* For platforms such as ia64, a hardware watchpoint is @@ -1708,9 +583,11 @@ /* Handle GNU/Linux's extended waitstatus for trace events. */ if (WIFSTOPPED (status) && WSTOPSIG (status) == SIGTRAP && status >> 16 != 0) { ---- gdb-6.3/gdb/linux-nat.h.fix Fri Jan 7 16:58:33 2005 -+++ gdb-6.3/gdb/linux-nat.h Fri Jan 7 17:04:07 2005 -@@ -61,6 +61,18 @@ struct lwp_info +Index: gdb-6.5/gdb/linux-nat.h +=================================================================== +--- gdb-6.5.orig/gdb/linux-nat.h 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/linux-nat.h 2006-07-07 04:24:57.000000000 -0300 +@@ -63,6 +63,18 @@ struct lwp_info /* Next LWP in list. */ struct lwp_info *next; @@ -1728,82 +605,42 @@ + int type; }; - /* Read/write to target memory via the Linux kernel's "proc file ---- gdb-6.3/gdb/Makefile.in.fix Fri Jan 7 16:58:42 2005 -+++ gdb-6.3/gdb/Makefile.in Fri Jan 7 17:04:07 2005 -@@ -2055,7 +2055,8 @@ ia64-aix-nat.o: ia64-aix-nat.c $(defs_h) - $(objfiles_h) $(gdb_stat_h) - ia64-aix-tdep.o: ia64-aix-tdep.c $(defs_h) + /* Attempt to initialize libthread_db. */ +Index: gdb-6.5/gdb/Makefile.in +=================================================================== +--- gdb-6.5.orig/gdb/Makefile.in 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/Makefile.in 2006-07-11 02:29:50.000000000 -0300 +@@ -2113,7 +2113,7 @@ i387-tdep.o: i387-tdep.c $(defs_h) $(dou + $(gdb_assert_h) $(gdb_string_h) $(i386_tdep_h) $(i387_tdep_h) ia64-linux-nat.o: ia64-linux-nat.c $(defs_h) $(gdb_string_h) $(inferior_h) \ -- $(target_h) $(gdbcore_h) $(regcache_h) $(gdb_wait_h) $(gregset_h) -+ $(target_h) $(gdbcore_h) $(regcache_h) $(gdb_wait_h) $(gregset_h) \ -+ $(observer_h) $(linux_nat_h) + $(target_h) $(gdbcore_h) $(regcache_h) $(ia64_tdep_h) $(gdb_wait_h) \ +- $(gregset_h) $(linux_nat_h) ++ $(gregset_h) $(observer_h) $(linux_nat_h) ia64-linux-tdep.o: ia64-linux-tdep.c $(defs_h) $(ia64_tdep_h) \ - $(arch_utils_h) $(gdbcore_h) $(regcache_h) + $(arch_utils_h) $(gdbcore_h) $(regcache_h) $(osabi_h) $(solib_svr4_h) ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) \ -@@ -2437,7 +2438,7 @@ rs6000-tdep.o: rs6000-tdep.c $(defs_h) $ - $(ppc_tdep_h) $(gdb_assert_h) $(dis_asm_h) $(trad_frame_h) \ - $(frame_unwind_h) $(frame_base_h) +@@ -2518,7 +2518,7 @@ rs6000-tdep.o: rs6000-tdep.c $(defs_h) $ + $(frame_unwind_h) $(frame_base_h) $(rs6000_tdep_h) + rs6000-aix-tdep.o: rs6000-aix-tdep.c $(defs_h) $(osabi_h) $(rs6000_tdep_h) s390-nat.o: s390-nat.c $(defs_h) $(tm_h) $(regcache_h) $(inferior_h) \ -- $(s390_tdep_h) -+ $(s390_tdep_h) $(observer_h) $(linux_nat_h) +- $(s390_tdep_h) $(target_h) $(linux_nat_h) ++ $(s390_tdep_h) $(target_h) $(observer_h) $(linux_nat_h) s390-tdep.o: s390-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) $(inferior_h) \ $(symtab_h) $(target_h) $(gdbcore_h) $(gdbcmd_h) $(objfiles_h) \ - $(tm_h) $(__bfd_bfd_h) $(floatformat_h) $(regcache_h) \ ---- gdb-6.3/gdb/thread-db.c.fix Fri Jan 7 16:58:49 2005 -+++ gdb-6.3/gdb/thread-db.c Fri Jan 7 17:04:07 2005 -@@ -34,6 +34,7 @@ + $(floatformat_h) $(regcache_h) $(trad_frame_h) $(frame_base_h) \ +Index: gdb-6.5/gdb/linux-thread-db.c +=================================================================== +--- gdb-6.5.orig/gdb/linux-thread-db.c 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/linux-thread-db.c 2006-07-11 02:29:49.000000000 -0300 +@@ -36,6 +36,7 @@ #include "target.h" #include "regcache.h" #include "solib-svr4.h" +#include "observer.h" + #include "gdbcore.h" + #include "linux-nat.h" - #ifdef HAVE_GNU_LIBC_VERSION_H - #include -@@ -143,7 +144,6 @@ static void detach_thread (ptid_t ptid, - #define is_thread(ptid) (GET_THREAD (ptid) != 0) - - #define BUILD_LWP(lwp, pid) ptid_build (pid, lwp, 0) --#define BUILD_THREAD(tid, pid) ptid_build (pid, 0, tid) - - - /* Use "struct private_thread_info" to cache thread state. This is -@@ -267,7 +267,7 @@ thread_get_info_callback (const td_thrha - thread_db_err_str (err)); - - /* Fill the cache. */ -- thread_ptid = BUILD_THREAD (ti.ti_tid, GET_PID (inferior_ptid)); -+ thread_ptid = ptid_build (GET_PID (inferior_ptid), ti.ti_lid, ti.ti_tid); - thread_info = find_thread_pid (thread_ptid); - - /* In the case of a zombie thread, don't continue. We don't want to -@@ -385,22 +385,14 @@ thread_from_lwp (ptid_t ptid) - - gdb_assert (thread_info && thread_info->private->ti_valid); - -- return BUILD_THREAD (thread_info->private->ti.ti_tid, GET_PID (ptid)); -+ return ptid_build (GET_PID (ptid), GET_LWP (ptid), -+ thread_info->private->ti.ti_tid); - } - - static ptid_t - lwp_from_thread (ptid_t ptid) - { -- struct thread_info *thread_info; -- ptid_t thread_ptid; -- -- if (!is_thread (ptid)) -- return ptid; -- -- thread_info = find_thread_pid (ptid); -- thread_db_get_info (thread_info); -- -- return BUILD_LWP (thread_info->private->ti.ti_lid, GET_PID (ptid)); -+ return BUILD_LWP (GET_LWP (ptid), GET_PID (ptid)); - } - - -@@ -722,6 +714,7 @@ attach_thread (ptid_t ptid, const td_thr +@@ -718,6 +719,7 @@ attach_thread (ptid_t ptid, const td_thr { struct thread_info *tp; td_err_e err; @@ -1811,7 +648,7 @@ /* If we're being called after a TD_CREATE event, we may already know about this thread. There are two ways this can happen. We -@@ -757,11 +750,18 @@ attach_thread (ptid_t ptid, const td_thr +@@ -753,11 +755,18 @@ attach_thread (ptid_t ptid, const td_thr if (ti_p->ti_state == TD_THR_UNKNOWN || ti_p->ti_state == TD_THR_ZOMBIE) return; /* A zombie thread -- do not attach. */ @@ -1831,16 +668,7 @@ /* Enable thread event reporting for this thread. */ err = td_thr_event_enable_p (th_p, 1); if (err != TD_OK) -@@ -903,7 +903,7 @@ check_event (ptid_t ptid) - if (err != TD_OK) - error ("Cannot get thread info: %s", thread_db_err_str (err)); - -- ptid = BUILD_THREAD (ti.ti_tid, GET_PID (ptid)); -+ ptid = ptid_build (GET_PID (ptid), ti.ti_lid, ti.ti_tid); - - switch (msg.event) - { -@@ -950,7 +950,8 @@ thread_db_wait (ptid_t ptid, struct targ +@@ -946,7 +955,8 @@ thread_db_wait (ptid_t ptid, struct targ return pid_to_ptid (-1); if (ourstatus->kind == TARGET_WAITKIND_STOPPED @@ -1850,18 +678,11 @@ /* Check for a thread event. */ check_event (ptid); -@@ -1175,7 +1176,7 @@ find_new_threads_callback (const td_thrh - if (ti.ti_state == TD_THR_UNKNOWN || ti.ti_state == TD_THR_ZOMBIE) - return 0; /* A zombie -- ignore. */ - -- ptid = BUILD_THREAD (ti.ti_tid, GET_PID (inferior_ptid)); -+ ptid = ptid_build (GET_PID (inferior_ptid), ti.ti_lid, ti.ti_tid); - - if (!in_thread_list (ptid)) - attach_thread (ptid, th_p, &ti, 1); ---- gdb-6.3/gdb/i386-linux-nat.c.fix Fri Jan 7 16:59:02 2005 -+++ gdb-6.3/gdb/i386-linux-nat.c Fri Jan 7 17:04:07 2005 -@@ -617,10 +617,9 @@ i386_linux_dr_get (int regnum) +Index: gdb-6.5/gdb/i386-linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/i386-linux-nat.c 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/i386-linux-nat.c 2006-07-11 02:29:47.000000000 -0300 +@@ -619,10 +619,9 @@ i386_linux_dr_get (int regnum) int tid; unsigned long value; @@ -1875,7 +696,7 @@ /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the ptrace call fails breaks debugging remote targets. The correct -@@ -645,10 +644,9 @@ i386_linux_dr_set (int regnum, unsigned +@@ -647,10 +646,9 @@ i386_linux_dr_set (int regnum, unsigned { int tid; @@ -1889,9 +710,11 @@ errno = 0; ptrace (PTRACE_POKEUSER, tid, ---- gdb-6.3/gdb/ia64-linux-nat.c.fix Fri Jan 7 16:59:11 2005 -+++ gdb-6.3/gdb/ia64-linux-nat.c Fri Jan 7 17:04:07 2005 -@@ -39,6 +39,8 @@ +Index: gdb-6.5/gdb/ia64-linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/ia64-linux-nat.c 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/ia64-linux-nat.c 2006-07-11 02:29:46.000000000 -0300 +@@ -41,6 +41,8 @@ #include #include @@ -1900,7 +723,7 @@ /* Prototypes for supply_gregset etc. */ #include "gregset.h" -@@ -559,8 +561,9 @@ is_power_of_2 (int val) +@@ -561,8 +563,9 @@ is_power_of_2 (int val) return onecount <= 1; } @@ -1912,7 +735,7 @@ { int idx; long dbr_addr, dbr_mask; -@@ -606,8 +609,38 @@ ia64_linux_insert_watchpoint (ptid_t pti +@@ -608,8 +611,38 @@ ia64_linux_insert_watchpoint (ptid_t pti return 0; } @@ -1952,7 +775,7 @@ { int idx; long dbr_addr, dbr_mask; -@@ -630,23 +663,74 @@ ia64_linux_remove_watchpoint (ptid_t pti +@@ -632,23 +665,74 @@ ia64_linux_remove_watchpoint (ptid_t pti return -1; } @@ -2030,7 +853,7 @@ return 0; psr = read_register_pid (IA64_PSR_REGNUM, ptid); -@@ -654,7 +738,7 @@ ia64_linux_stopped_data_address (CORE_AD +@@ -656,7 +740,7 @@ ia64_linux_stopped_data_address (CORE_AD for the next instruction */ write_register_pid (IA64_PSR_REGNUM, psr, ptid); @@ -2039,9 +862,9 @@ return 1; } -@@ -674,3 +758,36 @@ ia64_linux_xfer_unwind_table (struct tar - { - return syscall (__NR_getunwind, readbuf, len); +@@ -702,3 +786,36 @@ _initialize_ia64_linux_nat (void) + /* Register the target. */ + linux_nat_add_target (t); } + +/* Observer function for a new thread attach. We need to insert @@ -2076,9 +899,11 @@ + observer_attach_sigtrap (ia64_linux_save_sigtrap_info); +} + ---- gdb-6.3/gdb/amd64-linux-nat.c.fix Fri Jan 7 16:59:21 2005 -+++ gdb-6.3/gdb/amd64-linux-nat.c Fri Jan 7 17:04:07 2005 -@@ -233,10 +233,9 @@ amd64_linux_dr_get (int regnum) +Index: gdb-6.5/gdb/amd64-linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/amd64-linux-nat.c 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/amd64-linux-nat.c 2006-07-11 02:29:47.000000000 -0300 +@@ -234,10 +234,9 @@ amd64_linux_dr_get (int regnum) int tid; unsigned long value; @@ -2092,7 +917,7 @@ /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the ptrace call fails breaks debugging remote targets. The correct -@@ -261,10 +260,9 @@ amd64_linux_dr_set (int regnum, unsigned +@@ -262,10 +261,9 @@ amd64_linux_dr_set (int regnum, unsigned { int tid; @@ -2106,10 +931,12 @@ errno = 0; ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value); ---- gdb-6.3/gdb/s390-nat.c.fix Fri Jan 7 16:59:28 2005 -+++ gdb-6.3/gdb/s390-nat.c Fri Jan 7 17:04:07 2005 -@@ -27,6 +27,8 @@ - #include "inferior.h" +Index: gdb-6.5/gdb/s390-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/s390-nat.c 2006-07-07 04:24:43.000000000 -0300 ++++ gdb-6.5/gdb/s390-nat.c 2006-07-07 04:24:57.000000000 -0300 +@@ -30,6 +30,8 @@ + #include "linux-nat.h" #include "s390-tdep.h" +#include "linux-nat.h" @@ -2117,7 +944,7 @@ #include #include -@@ -112,14 +114,14 @@ fill_fpregset (fpregset_t *regp, int reg +@@ -114,14 +116,14 @@ fill_fpregset (fpregset_t *regp, int reg ((char *)regp) + regmap_fpregset[i]); } @@ -2136,34 +963,34 @@ return tid; } -@@ -203,7 +205,7 @@ store_fpregs (int tid, int regnum) - void - fetch_inferior_registers (int regnum) +@@ -205,7 +207,7 @@ store_fpregs (int tid, int regnum) + static void + s390_linux_fetch_inferior_registers (int regnum) { - int tid = s390_inferior_tid (); + int tid = s390_tid (inferior_ptid); if (regnum == -1 || (regnum < S390_NUM_REGS && regmap_gregset[regnum] != -1)) -@@ -219,7 +221,7 @@ fetch_inferior_registers (int regnum) - void - store_inferior_registers (int regnum) +@@ -221,7 +223,7 @@ s390_linux_fetch_inferior_registers (int + static void + s390_linux_store_inferior_registers (int regnum) { - int tid = s390_inferior_tid (); + int tid = s390_tid (inferior_ptid); if (regnum == -1 || (regnum < S390_NUM_REGS && regmap_gregset[regnum] != -1)) -@@ -261,7 +263,7 @@ s390_stopped_by_watchpoint (void) +@@ -263,7 +265,7 @@ s390_stopped_by_watchpoint (void) parea.len = sizeof (per_lowcore); parea.process_addr = (addr_t) & per_lowcore; parea.kernel_addr = offsetof (struct user_regs_struct, per_info.lowcore); - if (ptrace (PTRACE_PEEKUSR_AREA, s390_inferior_tid (), &parea) < 0) + if (ptrace (PTRACE_PEEKUSR_AREA, s390_tid (inferior_ptid), &parea) < 0) - perror_with_name ("Couldn't retrieve watchpoint status"); + perror_with_name (_("Couldn't retrieve watchpoint status")); return per_lowcore.perc_storage_alteration == 1 -@@ -269,9 +271,9 @@ s390_stopped_by_watchpoint (void) +@@ -271,9 +273,9 @@ s390_stopped_by_watchpoint (void) } static void @@ -2175,8 +1002,8 @@ per_struct per_info; ptrace_area parea; -@@ -308,6 +310,16 @@ s390_fix_watch_points (void) - perror_with_name ("Couldn't modify watchpoint status"); +@@ -310,6 +312,16 @@ s390_fix_watch_points (void) + perror_with_name (_("Couldn't modify watchpoint status")); } +/* Callback routine to use with iterate_over_lwps to insert a specified @@ -2189,10 +1016,10 @@ +} + +/* Insert a specified watchpoint on all threads. */ - int - s390_insert_watchpoint (CORE_ADDR addr, int len) + static int + s390_insert_watchpoint (CORE_ADDR addr, int len, int type) { -@@ -321,10 +333,24 @@ s390_insert_watchpoint (CORE_ADDR addr, +@@ -323,10 +335,24 @@ s390_insert_watchpoint (CORE_ADDR addr, area->next = watch_base; watch_base = area; @@ -2202,23 +1029,23 @@ + if (iterate_over_lwps (&s390_insert_watchpoint_callback, NULL)) + return -1; + - return 0; - } - ++ return 0; ++} ++ +/* Callback routine to use with iterate_over_lwps to remove a specified + watchpoint from all threads. */ +static int +s390_remove_watchpoint_callback (struct lwp_info *lwp, void *data) +{ + s390_fix_watch_points (lwp->ptid); -+ return 0; -+} -+ + return 0; + } + +/* Remove a specified watchpoint from all threads. */ - int - s390_remove_watchpoint (CORE_ADDR addr, int len) + static int + s390_remove_watchpoint (CORE_ADDR addr, int len, int type) { -@@ -346,7 +372,11 @@ s390_remove_watchpoint (CORE_ADDR addr, +@@ -348,7 +374,11 @@ s390_remove_watchpoint (CORE_ADDR addr, *parea = area->next; xfree (area); @@ -2231,8 +1058,8 @@ return 0; } -@@ -357,3 +387,17 @@ kernel_u_size (void) - return sizeof (struct user); +@@ -364,6 +394,15 @@ s390_region_ok_for_hw_watchpoint (CORE_A + return 1; } +/* New thread observer that inserts all existing watchpoints on the @@ -2244,20 +1071,13 @@ + s390_fix_watch_points (ptid); +} + -+void -+_initialize_s390_nat (void) -+{ + + void _initialize_s390_nat (void); + +@@ -389,4 +428,6 @@ _initialize_s390_nat (void) + + /* Register the target. */ + linux_nat_add_target (t); ++ + observer_attach_linux_new_thread (s390_linux_new_thread); -+} ---- gdb-6.3/gdb/gdbarch.sh.fix Fri Jan 7 17:30:46 2005 -+++ gdb-6.3/gdb/gdbarch.sh Fri Jan 7 17:32:28 2005 -@@ -611,6 +611,9 @@ f:=:CORE_ADDR:smash_text_address:CORE_AD - # FIXME/cagney/2001-01-18: The logic is backwards. It should be asking if the target can - # single step. If not, then implement single step using breakpoints. - F:=:void:software_single_step:enum target_signal sig, int insert_breakpoints_p:sig, insert_breakpoints_p -+# Return non-zero if the processor is executing a delay slot and a -+# further single-step is needed before the instruction finishes. -+M::int:single_step_through_delay:struct frame_info *frame:frame - # FIXME: cagney/2003-08-28: Need to find a better way of selecting the - # disassembler. Perhaps objdump can handle it? - f:TARGET_PRINT_INSN:int:print_insn:bfd_vma vma, struct disassemble_info *info:vma, info::0: + } diff --git a/gdb-6.3-threaded-watchpoints2-20050225.patch b/gdb-6.3-threaded-watchpoints2-20050225.patch index 0dec96d..1496d82 100644 --- a/gdb-6.3-threaded-watchpoints2-20050225.patch +++ b/gdb-6.3-threaded-watchpoints2-20050225.patch @@ -35,16 +35,10 @@ * testsuite/gdb.threads/watchthreads2.c: New test case. * testsuite/gdb.threads/watchthreads2.exp: Ditto. ---- gdb-6.3/gdb/config/i386/nm-linux64.h.fix 2004-08-15 12:10:23.000000000 -0400 -+++ gdb-6.3/gdb/config/i386/nm-linux64.h 2005-02-28 17:36:09.000000000 -0500 -@@ -1,6 +1,6 @@ - /* Native support for GNU/Linux x86-64. - -- Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+ Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - - Contributed by Jiri Smid, SuSE Labs. - +Index: gdb-6.5/gdb/config/i386/nm-linux64.h +=================================================================== +--- gdb-6.5.orig/gdb/config/i386/nm-linux64.h 2006-07-11 02:44:36.000000000 -0300 ++++ gdb-6.5/gdb/config/i386/nm-linux64.h 2006-07-11 02:45:16.000000000 -0300 @@ -35,22 +35,59 @@ /* Provide access to the i386 hardware debugging registers. */ @@ -87,11 +81,11 @@ + +/* Insert a hardware-assisted breakpoint at address ADDR. SHADOW is + * * unused. Return 0 on success, EBUSY on failure. */ -+extern int amd64_linux_insert_hw_breakpoint (CORE_ADDR addr, void *shadow); ++extern int amd64_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt); + +/* Remove a hardware-assisted breakpoint at address ADDR. SHADOW is + * * unused. Return 0 on success, -1 on failure. */ -+extern int amd64_linux_remove_hw_breakpoint (CORE_ADDR addr, void *shadow); ++extern int amd64_linux_remove_hw_breakpoint (struct bp_target_info *bp_tgt); + +/* Override basic amd64 macros for watchpoint and hardware breakpoint + * insertion/removal to support threads. */ @@ -104,27 +98,20 @@ + amd64_linux_remove_watchpoint (addr, len, type) + +#undef target_insert_hw_breakpoint -+#define target_insert_hw_breakpoint(addr, shadow) \ -+ amd64_linux_insert_hw_breakpoint (addr, shadow) ++#define target_insert_hw_breakpoint(bp_tgt) \ ++ amd64_linux_insert_hw_breakpoint (bp_tgt) + +#undef target_remove_hw_breakpoint -+#define target_remove_hw_breakpoint(addr, shadow) \ -+ amd64_linux_remove_hw_breakpoint (addr, shadow) ++#define target_remove_hw_breakpoint(bp_tgt) \ ++ amd64_linux_remove_hw_breakpoint (bp_tgt) /* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ #define FETCH_INFERIOR_REGISTERS ---- gdb-6.3/gdb/config/i386/nm-linux.h.fix 2004-09-20 12:39:35.000000000 -0400 -+++ gdb-6.3/gdb/config/i386/nm-linux.h 2005-02-28 17:36:00.000000000 -0500 -@@ -1,7 +1,7 @@ - /* Native support for GNU/Linux x86. - - Copyright 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, -- 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. -+ 1998, 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc. - - This file is part of GDB. - -@@ -45,23 +45,61 @@ extern CORE_ADDR register_u_addr (CORE_A +Index: gdb-6.5/gdb/config/i386/nm-linux.h +=================================================================== +--- gdb-6.5.orig/gdb/config/i386/nm-linux.h 2006-07-11 02:44:36.000000000 -0300 ++++ gdb-6.5/gdb/config/i386/nm-linux.h 2006-07-11 02:45:16.000000000 -0300 +@@ -46,23 +46,61 @@ extern CORE_ADDR register_u_addr (CORE_A /* Provide access to the i386 hardware debugging registers. */ @@ -167,11 +154,11 @@ + +/* Insert a hardware-assisted breakpoint at address ADDR. SHADOW is + * unused. Return 0 on success, EBUSY on failure. */ -+extern int i386_linux_insert_hw_breakpoint (CORE_ADDR addr, void *shadow); ++extern int i386_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt); + +/* Remove a hardware-assisted breakpoint at address ADDR. SHADOW is + * unused. Return 0 on success, -1 on failure. */ -+extern int i386_linux_remove_hw_breakpoint (CORE_ADDR addr, void *shadow); ++extern int i386_linux_remove_hw_breakpoint (struct bp_target_info *bp_tgt); + +/* Override basic i386 macros for watchpoint and hardware breakpoint + insertion/removal to support threads. */ @@ -184,26 +171,20 @@ + i386_linux_remove_watchpoint (addr, len, type) + +#undef target_insert_hw_breakpoint -+#define target_insert_hw_breakpoint(addr, shadow) \ -+ i386_linux_insert_hw_breakpoint (addr, shadow) ++#define target_insert_hw_breakpoint(bp_tgt) \ ++ i386_linux_insert_hw_breakpoint (bp_tgt) + +#undef target_remove_hw_breakpoint -+#define target_remove_hw_breakpoint(addr, shadow) \ -+ i386_linux_remove_hw_breakpoint (addr, shadow) ++#define target_remove_hw_breakpoint(bp_tgt) \ ++ i386_linux_remove_hw_breakpoint (bp_tgt) + /* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */ #define FETCH_INFERIOR_REGISTERS ---- gdb-6.3/gdb/i386-nat.c.fix 2005-02-25 16:53:44.000000000 -0500 -+++ gdb-6.3/gdb/i386-nat.c 2005-02-28 17:33:11.000000000 -0500 -@@ -1,6 +1,6 @@ - /* Native-dependent code for the i386. - -- Copyright 2001, 2004 Free Software Foundation, Inc. -+ Copyright 2001, 2004, 2005 Free Software Foundation, Inc. - - This file is part of GDB. - +Index: gdb-6.5/gdb/i386-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/i386-nat.c 2006-07-11 02:44:36.000000000 -0300 ++++ gdb-6.5/gdb/i386-nat.c 2006-07-11 02:45:16.000000000 -0300 @@ -21,6 +21,7 @@ #include "defs.h" @@ -212,8 +193,10 @@ #include "command.h" #include "gdbcmd.h" ---- gdb-6.3/gdb/testsuite/gdb.threads/watchthreads2.c.fix 2005-02-28 17:33:54.000000000 -0500 -+++ gdb-6.3/gdb/testsuite/gdb.threads/watchthreads2.c 2005-02-28 17:35:37.000000000 -0500 +Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c 2006-07-11 02:45:16.000000000 -0300 @@ -0,0 +1,66 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -281,8 +264,10 @@ + pthread_exit(NULL); +} + ---- gdb-6.3/gdb/testsuite/gdb.threads/watchthreads2.exp.fix 2005-02-28 17:33:57.000000000 -0500 -+++ gdb-6.3/gdb/testsuite/gdb.threads/watchthreads2.exp 2005-02-28 17:35:33.000000000 -0500 +Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp 2006-07-11 02:45:16.000000000 -0300 @@ -0,0 +1,133 @@ +# This testcase is part of GDB, the GNU debugger. + @@ -417,26 +402,19 @@ +} else { + fail $message +} ---- gdb-6.3/gdb/i386-linux-nat.c.fix 2005-02-24 19:36:12.000000000 -0500 -+++ gdb-6.3/gdb/i386-linux-nat.c 2005-02-28 17:33:01.000000000 -0500 -@@ -1,6 +1,7 @@ - /* Native-dependent code for GNU/Linux i386. - -- Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+ Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+ Free Software Foundation, Inc. - - This file is part of GDB. - -@@ -23,6 +24,7 @@ +Index: gdb-6.5/gdb/i386-linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/i386-linux-nat.c 2006-07-11 02:44:36.000000000 -0300 ++++ gdb-6.5/gdb/i386-linux-nat.c 2006-07-11 02:45:16.000000000 -0300 +@@ -24,6 +24,7 @@ #include "inferior.h" #include "gdbcore.h" #include "regcache.h" +#include "observer.h" + #include "target.h" #include "linux-nat.h" - #include "gdb_assert.h" -@@ -612,14 +614,14 @@ store_inferior_registers (int regno) +@@ -614,14 +615,14 @@ i386_linux_store_inferior_registers (int /* Support for debug registers. */ static unsigned long @@ -454,7 +432,7 @@ /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the ptrace call fails breaks debugging remote targets. The correct -@@ -640,13 +642,13 @@ i386_linux_dr_get (int regnum) +@@ -642,13 +643,13 @@ i386_linux_dr_get (int regnum) } static void @@ -471,7 +449,7 @@ errno = 0; ptrace (PTRACE_POKEUSER, tid, -@@ -656,34 +658,158 @@ i386_linux_dr_set (int regnum, unsigned +@@ -658,34 +659,158 @@ i386_linux_dr_set (int regnum, unsigned } void @@ -599,10 +577,10 @@ +/* Insert a hardware-assisted breakpoint at address ADDR. SHADOW is + unused. Return 0 on success, EBUSY on failure. */ +int -+i386_linux_insert_hw_breakpoint (CORE_ADDR addr, void *shadow) ++i386_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt) +{ + int rc; -+ rc = i386_insert_hw_breakpoint (addr, shadow); ++ rc = i386_insert_hw_breakpoint (bt_tgt); + if (!rc) + i386_linux_sync_debug_registers_across_threads (); + return rc; @@ -611,10 +589,10 @@ +/* Remove a hardware-assisted breakpoint at address ADDR. SHADOW is + unused. Return 0 on success, -1 on failure. */ +int -+i386_linux_remove_hw_breakpoint (CORE_ADDR addr, void *shadow) ++i386_linux_remove_hw_breakpoint (struct bp_target_info *bp_tgt) +{ + int rc; -+ rc = i386_remove_hw_breakpoint (addr, shadow); ++ rc = i386_remove_hw_breakpoint (bp_tgt); + if (!rc) + i386_linux_sync_debug_registers_across_threads (); + return rc; @@ -638,9 +616,9 @@ /* Called by libthread_db. Returns a pointer to the thread local storage (or its descriptor). */ -@@ -817,3 +943,10 @@ child_post_startup_inferior (ptid_t ptid - i386_cleanup_dregs (); - linux_child_post_startup_inferior (ptid); +@@ -844,3 +969,10 @@ _initialize_i386_linux_nat (void) + /* Register the target. */ + linux_nat_add_target (t); } + +void @@ -649,17 +627,11 @@ + observer_attach_linux_new_thread (i386_linux_new_thread); +} + ---- gdb-6.3/gdb/amd64-linux-nat.c.fix 2005-02-24 19:37:56.000000000 -0500 -+++ gdb-6.3/gdb/amd64-linux-nat.c 2005-02-28 17:32:44.000000000 -0500 -@@ -1,6 +1,6 @@ - /* Native-dependent code for GNU/Linux x86-64. - -- Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+ Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - Contributed by Jiri Smid, SuSE Labs. - - This file is part of GDB. -@@ -24,6 +24,7 @@ +Index: gdb-6.5/gdb/amd64-linux-nat.c +=================================================================== +--- gdb-6.5.orig/gdb/amd64-linux-nat.c 2006-07-11 02:44:36.000000000 -0300 ++++ gdb-6.5/gdb/amd64-linux-nat.c 2006-07-11 02:45:16.000000000 -0300 +@@ -25,6 +25,7 @@ #include "inferior.h" #include "gdbcore.h" #include "regcache.h" @@ -667,7 +639,7 @@ #include "linux-nat.h" #include "gdb_assert.h" -@@ -228,14 +229,14 @@ store_inferior_registers (int regnum) +@@ -229,14 +230,14 @@ amd64_linux_store_inferior_registers (in static unsigned long @@ -685,7 +657,7 @@ /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the ptrace call fails breaks debugging remote targets. The correct -@@ -256,13 +257,13 @@ amd64_linux_dr_get (int regnum) +@@ -257,13 +258,13 @@ amd64_linux_dr_get (int regnum) } static void @@ -702,7 +674,7 @@ errno = 0; ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value); -@@ -271,34 +272,158 @@ amd64_linux_dr_set (int regnum, unsigned +@@ -272,34 +273,158 @@ amd64_linux_dr_set (int regnum, unsigned } void @@ -830,10 +802,10 @@ +/* Insert a hardware-assisted breakpoint at address ADDR. SHADOW is + unused. Return 0 on success, EBUSY on failure. */ +int -+amd64_linux_insert_hw_breakpoint (CORE_ADDR addr, void *shadow) ++amd64_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt) +{ + int rc; -+ rc = i386_insert_hw_breakpoint (addr, shadow); ++ rc = i386_insert_hw_breakpoint (bp_tgt); + if (!rc) + amd64_linux_sync_debug_registers_across_threads (); + return rc; @@ -842,10 +814,10 @@ +/* Remove a hardware-assisted breakpoint at address ADDR. SHADOW is + unused. Return 0 on success, -1 on failure. */ +int -+amd64_linux_remove_hw_breakpoint (CORE_ADDR addr, void *shadow) ++amd64_linux_remove_hw_breakpoint (struct bp_target_info *bp_tgt) +{ + int rc; -+ rc = i386_remove_hw_breakpoint (addr, shadow); ++ rc = i386_remove_hw_breakpoint (bp_tgt); + if (!rc) + amd64_linux_sync_debug_registers_across_threads (); + return rc; @@ -869,10 +841,10 @@ /* This function is called by libthread_db as part of its handling of a request for a thread's local storage address. */ -@@ -380,4 +505,6 @@ _initialize_amd64_linux_nat (void) - == amd64_native_gregset32_num_regs); - gdb_assert (ARRAY_SIZE (amd64_linux_gregset64_reg_offset) - == amd64_native_gregset64_num_regs); +@@ -399,4 +524,6 @@ _initialize_amd64_linux_nat (void) + + /* Register the target. */ + linux_nat_add_target (t); + + observer_attach_linux_new_thread (amd64_linux_new_thread); } diff --git a/gdb-6.3-warnings-20050317.patch b/gdb-6.3-warnings-20050317.patch index 549c823..d050a8a 100644 --- a/gdb-6.3-warnings-20050317.patch +++ b/gdb-6.3-warnings-20050317.patch @@ -1,4595 +1,21 @@ ---- gdb-6.3/gdb/configure.fix 2005-03-21 18:12:23.000000000 -0500 -+++ gdb-6.3/gdb/configure 2005-03-21 18:13:32.000000000 -0500 -@@ -79,7 +79,6 @@ program_suffix=NONE - program_transform_name=s,x,x, - silent= - site= --sitefile= - srcdir= - target=NONE - verbose= -@@ -194,7 +193,6 @@ Configuration: - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages -- --site-file=FILE use FILE as the site file - --version print the version of autoconf that created configure - Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX -@@ -365,11 +363,6 @@ EOF - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - -- -site-file | --site-file | --site-fil | --site-fi | --site-f) -- ac_prev=sitefile ;; -- -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) -- sitefile="$ac_optarg" ;; -- - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -@@ -535,16 +528,12 @@ fi - srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - - # Prefer explicitly selected file to automatically selected ones. --if test -z "$sitefile"; then -- if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+if test -z "$CONFIG_SITE"; then -+ if test "x$prefix" != xNONE; then -+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -+ else -+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi --else -- CONFIG_SITE="$sitefile" - fi - for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then -@@ -585,7 +574,7 @@ fi - - - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 --echo "configure:589: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+echo "configure:578: checking whether to enable maintainer-specific portions of Makefiles" >&5 - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. - if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" -@@ -611,7 +600,7 @@ fi - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:615: checking for $ac_word" >&5 -+echo "configure:604: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -641,7 +630,7 @@ if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:645: checking for $ac_word" >&5 -+echo "configure:634: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -692,7 +681,7 @@ fi - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:696: checking for $ac_word" >&5 -+echo "configure:685: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -724,7 +713,7 @@ fi - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:717: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -735,12 +724,12 @@ cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext << EOF - --#line 739 "configure" -+#line 728 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -766,12 +755,12 @@ if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:759: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:775: checking whether we are using GNU C" >&5 -+echo "configure:764: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -780,7 +769,7 @@ else - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -799,7 +788,7 @@ ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:803: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:792: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -836,7 +825,7 @@ EOF - - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:840: checking how to run the C preprocessor" >&5 -+echo "configure:829: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -851,13 +840,13 @@ else - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -868,13 +857,13 @@ else - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -885,13 +874,13 @@ else - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -916,9 +905,9 @@ fi - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking for AIX""... $ac_c" 1>&6 --echo "configure:920: checking for AIX" >&5 -+echo "configure:909: checking for AIX" >&5 - cat > conftest.$ac_ext <&6 --echo "configure:944: checking for POSIXized ISC" >&5 -+echo "configure:933: checking for POSIXized ISC" >&5 - if test -d /etc/conf/kconfig.d && - grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 - then -@@ -964,7 +953,7 @@ fi - - - echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 --echo "configure:968: checking for ${CC-cc} option to accept ANSI C" >&5 -+echo "configure:957: checking for ${CC-cc} option to accept ANSI C" >&5 - if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -981,7 +970,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 -A - do - CC="$ac_save_CC $ac_arg" - cat > conftest.$ac_ext < - #include -@@ -1018,7 +1007,7 @@ return f (e, argv, 0) != argv[0] || f - - ; return 0; } - EOF --if { (eval echo configure:1022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - am_cv_prog_cc_stdc="$ac_arg"; break - else -@@ -1089,7 +1078,7 @@ else { echo "configure: error: can not r - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:1093: checking host system type" >&5 -+echo "configure:1082: checking host system type" >&5 - - host_alias=$host - case "$host_alias" in -@@ -1110,7 +1099,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- - echo "$ac_t""$host" 1>&6 - - echo $ac_n "checking target system type""... $ac_c" 1>&6 --echo "configure:1114: checking target system type" >&5 -+echo "configure:1103: checking target system type" >&5 - - target_alias=$target - case "$target_alias" in -@@ -1128,7 +1117,7 @@ target_os=`echo $target | sed 's/^\([^-] - echo "$ac_t""$target" 1>&6 - - echo $ac_n "checking build system type""... $ac_c" 1>&6 --echo "configure:1132: checking build system type" >&5 -+echo "configure:1121: checking build system type" >&5 - - build_alias=$build - case "$build_alias" in -@@ -1166,7 +1155,7 @@ fi - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1170: checking for $ac_word" >&5 -+echo "configure:1159: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1198,7 +1187,7 @@ if test -n "$ac_tool_prefix"; then - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1202: checking for $ac_word" >&5 -+echo "configure:1191: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1244,7 +1233,7 @@ CONFIG_UNINSTALL= - - - echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 --echo "configure:1248: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "configure:1237: checking whether ${MAKE-make} sets \${MAKE}" >&5 - set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1273,7 +1262,7 @@ fi - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1277: checking for $ac_word" >&5 -+echo "configure:1266: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1301,12 +1290,12 @@ else - fi - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1305: checking for ANSI C header files" >&5 -+echo "configure:1294: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -1314,7 +1303,7 @@ else - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1331,7 +1320,7 @@ rm -f conftest* - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -1349,7 +1338,7 @@ fi - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -1370,7 +1359,7 @@ if test "$cross_compiling" = yes; then - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -1381,7 +1370,7 @@ if (XOR (islower (i), ISLOWER (i)) || to - exit (0); } - - EOF --if { (eval echo configure:1385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -1405,12 +1394,12 @@ EOF - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:1409: checking for working const" >&5 -+echo "configure:1398: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -1480,21 +1469,21 @@ EOF - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:1484: checking for inline" >&5 -+echo "configure:1473: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -1520,12 +1509,12 @@ EOF - esac - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:1524: checking for off_t" >&5 -+echo "configure:1513: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -1553,12 +1542,12 @@ EOF - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:1557: checking for size_t" >&5 -+echo "configure:1546: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -1588,19 +1577,19 @@ fi - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 --echo "configure:1592: checking for working alloca.h" >&5 -+echo "configure:1581: checking for working alloca.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes - else -@@ -1621,12 +1610,12 @@ EOF - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:1625: checking for alloca" >&5 -+echo "configure:1614: checking for alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_alloca_works=yes - else -@@ -1686,12 +1675,12 @@ EOF - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:1690: checking whether alloca needs Cray hooks" >&5 -+echo "configure:1679: checking whether alloca needs Cray hooks" >&5 - if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&6 - if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:1720: checking for $ac_func" >&5 -+echo "configure:1709: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -1771,7 +1760,7 @@ done - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:1775: checking stack direction for C alloca" >&5 -+echo "configure:1764: checking stack direction for C alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1779,7 +1768,7 @@ else - ac_cv_c_stack_direction=0 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_stack_direction=1 - else -@@ -1823,17 +1812,17 @@ for ac_hdr in unistd.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1827: checking for $ac_hdr" >&5 -+echo "configure:1816: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1862,12 +1851,12 @@ done - for ac_func in getpagesize - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:1866: checking for $ac_func" >&5 -+echo "configure:1855: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -1915,7 +1904,7 @@ fi - done - - echo $ac_n "checking for working mmap""... $ac_c" 1>&6 --echo "configure:1919: checking for working mmap" >&5 -+echo "configure:1908: checking for working mmap" >&5 - if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1923,7 +1912,7 @@ else - ac_cv_func_mmap_fixed_mapped=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_mmap_fixed_mapped=yes - else -@@ -2091,17 +2080,17 @@ unistd.h values.h sys/param.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2095: checking for $ac_hdr" >&5 -+echo "configure:2084: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2131,12 +2120,12 @@ done - __argz_count __argz_stringify __argz_next - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2135: checking for $ac_func" >&5 -+echo "configure:2124: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -2188,12 +2177,12 @@ done - for ac_func in stpcpy - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2192: checking for $ac_func" >&5 -+echo "configure:2181: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -2250,19 +2239,19 @@ EOF - - if test $ac_cv_header_locale_h = yes; then - echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 --echo "configure:2254: checking for LC_MESSAGES" >&5 -+echo "configure:2243: checking for LC_MESSAGES" >&5 - if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - return LC_MESSAGES - ; return 0; } - EOF --if { (eval echo configure:2266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_val_LC_MESSAGES=yes - else -@@ -2283,7 +2272,7 @@ EOF - fi - fi - echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 --echo "configure:2287: checking whether NLS is requested" >&5 -+echo "configure:2276: checking whether NLS is requested" >&5 - # Check whether --enable-nls or --disable-nls was given. - if test "${enable_nls+set}" = set; then - enableval="$enable_nls" -@@ -2303,7 +2292,7 @@ fi - EOF - - echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 --echo "configure:2307: checking whether included gettext is requested" >&5 -+echo "configure:2296: checking whether included gettext is requested" >&5 - # Check whether --with-included-gettext or --without-included-gettext was given. - if test "${with_included_gettext+set}" = set; then - withval="$with_included_gettext" -@@ -2322,17 +2311,17 @@ fi - - ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 --echo "configure:2326: checking for libintl.h" >&5 -+echo "configure:2315: checking for libintl.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2349,19 +2338,19 @@ fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 --echo "configure:2353: checking for gettext in libc" >&5 -+echo "configure:2342: checking for gettext in libc" >&5 - if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - return (int) gettext ("") - ; return 0; } - EOF --if { (eval echo configure:2365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - gt_cv_func_gettext_libc=yes - else -@@ -2377,7 +2366,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1 - - if test "$gt_cv_func_gettext_libc" != "yes"; then - echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 --echo "configure:2381: checking for bindtextdomain in -lintl" >&5 -+echo "configure:2370: checking for bindtextdomain in -lintl" >&5 - ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2385,7 +2374,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lintl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2412,19 +2401,19 @@ fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 --echo "configure:2416: checking for gettext in libintl" >&5 -+echo "configure:2405: checking for gettext in libintl" >&5 - if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - gt_cv_func_gettext_libintl=yes - else -@@ -2452,7 +2441,7 @@ EOF - # Extract the first word of "msgfmt", so it can be a program name with args. - set dummy msgfmt; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2456: checking for $ac_word" >&5 -+echo "configure:2445: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2486,12 +2475,12 @@ fi - for ac_func in dcgettext - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2490: checking for $ac_func" >&5 -+echo "configure:2479: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -2541,7 +2530,7 @@ done - # Extract the first word of "gmsgfmt", so it can be a program name with args. - set dummy gmsgfmt; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2545: checking for $ac_word" >&5 -+echo "configure:2534: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2577,7 +2566,7 @@ fi - # Extract the first word of "xgettext", so it can be a program name with args. - set dummy xgettext; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2581: checking for $ac_word" >&5 -+echo "configure:2570: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2609,7 +2598,7 @@ else - fi - - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - CATOBJEXT=.gmo - DATADIRNAME=share -@@ -2649,7 +2638,7 @@ fi - # Extract the first word of "msgfmt", so it can be a program name with args. - set dummy msgfmt; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2653: checking for $ac_word" >&5 -+echo "configure:2642: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2683,7 +2672,7 @@ fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. - set dummy gmsgfmt; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2687: checking for $ac_word" >&5 -+echo "configure:2676: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2719,7 +2708,7 @@ fi - # Extract the first word of "xgettext", so it can be a program name with args. - set dummy xgettext; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2723: checking for $ac_word" >&5 -+echo "configure:2712: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2809,7 +2798,7 @@ fi - LINGUAS= - else - echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 --echo "configure:2813: checking for catalogs to be installed" >&5 -+echo "configure:2802: checking for catalogs to be installed" >&5 - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in -@@ -2837,17 +2826,17 @@ echo "configure:2813: checking for catal - if test "$CATOBJEXT" = ".cat"; then - ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 --echo "configure:2841: checking for linux/version.h" >&5 -+echo "configure:2830: checking for linux/version.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2915,7 +2904,7 @@ localedir='${datadir}/locale' - if test "x$POSUB" != x; then - - echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 --echo "configure:2919: checking for catalogs to be installed" >&5 -+echo "configure:2908: checking for catalogs to be installed" >&5 - # Look for .po and .gmo files in the source directory. - CATALOGS= - XLINGUAS= -@@ -3135,17 +3124,17 @@ else - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:3139: checking for $ac_hdr" >&5 -+echo "configure:3128: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -3175,17 +3164,17 @@ done - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:3179: checking for $ac_hdr" >&5 -+echo "configure:3168: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -3223,17 +3212,17 @@ if test x"$enable_libunwind" = xyes; the - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:3227: checking for $ac_hdr" >&5 -+echo "configure:3216: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -3263,17 +3252,17 @@ done - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:3267: checking for $ac_hdr" >&5 -+echo "configure:3256: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -3326,12 +3315,12 @@ fi - for ac_func in monstartup _mcleanup - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3330: checking for $ac_func" >&5 -+echo "configure:3319: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3379,12 +3368,12 @@ fi - done - - echo $ac_n "checking for _etext""... $ac_c" 1>&6 --echo "configure:3383: checking for _etext" >&5 -+echo "configure:3372: checking for _etext" >&5 - if eval "test \"`echo '$''{'ac_cv_var__etext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - extern char _etext; -@@ -3393,7 +3382,7 @@ int main() { - free (&_etext); - ; return 0; } - EOF --if { (eval echo configure:3397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_var__etext=yes - else -@@ -3421,19 +3410,19 @@ if test "$enable_profiling" = yes ; then - CFLAGS="$CFLAGS $PROFILE_CFLAGS" - - echo $ac_n "checking whether $CC supports -pg""... $ac_c" 1>&6 --echo "configure:3425: checking whether $CC supports -pg" >&5 -+echo "configure:3414: checking whether $CC supports -pg" >&5 - if eval "test \"`echo '$''{'ac_cv_cc_supports_pg'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cc_supports_pg=yes - else -@@ -3463,7 +3452,7 @@ do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3467: checking for $ac_word" >&5 -+echo "configure:3456: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3504,7 +3493,7 @@ done - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:3508: checking for a BSD compatible install" >&5 -+echo "configure:3497: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3557,7 +3546,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:3561: checking whether ln -s works" >&5 -+echo "configure:3550: checking whether ln -s works" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3580,7 +3569,7 @@ fi - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3584: checking for $ac_word" >&5 -+echo "configure:3573: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3612,7 +3601,7 @@ do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3616: checking for $ac_word" >&5 -+echo "configure:3605: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3646,7 +3635,7 @@ test -n "$YACC" || YACC="yacc" - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3650: checking for $ac_word" >&5 -+echo "configure:3639: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3678,7 +3667,7 @@ fi - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. - set dummy ${ac_tool_prefix}dlltool; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3682: checking for $ac_word" >&5 -+echo "configure:3671: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3710,7 +3699,7 @@ fi - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. - set dummy ${ac_tool_prefix}windres; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3714: checking for $ac_word" >&5 -+echo "configure:3703: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3744,7 +3733,7 @@ fi - # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args. - set dummy ${ac_tool_prefix}mig; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3748: checking for $ac_word" >&5 -+echo "configure:3737: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_MIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3780,7 +3769,7 @@ fi - - # We might need to link with -lm; most simulators need it. - echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 --echo "configure:3784: checking for main in -lm" >&5 -+echo "configure:3773: checking for main in -lm" >&5 - ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3788,14 +3777,14 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lm $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3828,12 +3817,12 @@ fi - # libw that some versions of the GNU linker cannot hanle (GNU ld 2.9.1 - # is known to have this problem). Therefore we avoid libw if we can. - echo $ac_n "checking for wctype""... $ac_c" 1>&6 --echo "configure:3832: checking for wctype" >&5 -+echo "configure:3821: checking for wctype" >&5 - if eval "test \"`echo '$''{'ac_cv_func_wctype'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_wctype=yes" - else -@@ -3874,7 +3863,7 @@ if eval "test \"`echo '$ac_cv_func_'wcty - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for wctype in -lw""... $ac_c" 1>&6 --echo "configure:3878: checking for wctype in -lw" >&5 -+echo "configure:3867: checking for wctype in -lw" >&5 - ac_lib_var=`echo w'_'wctype | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3882,7 +3871,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lw $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3926,14 +3915,14 @@ fi - # Some systems (e.g. Solaris) have `gethostbyname' in libnsl. - - echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 --echo "configure:3930: checking for library containing gethostbyname" >&5 -+echo "configure:3919: checking for library containing gethostbyname" >&5 - if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_func_search_save_LIBS="$LIBS" - ac_cv_search_gethostbyname="no" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_gethostbyname="none required" - else -@@ -3955,7 +3944,7 @@ rm -f conftest* - test "$ac_cv_search_gethostbyname" = "no" && for i in nsl; do - LIBS="-l$i $ac_func_search_save_LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_gethostbyname="-l$i" - break -@@ -3990,14 +3979,14 @@ fi - # Some systems (e.g. Solaris) have `socketpair' in libsocket. - - echo $ac_n "checking for library containing socketpair""... $ac_c" 1>&6 --echo "configure:3994: checking for library containing socketpair" >&5 -+echo "configure:3983: checking for library containing socketpair" >&5 - if eval "test \"`echo '$''{'ac_cv_search_socketpair'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_func_search_save_LIBS="$LIBS" - ac_cv_search_socketpair="no" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_socketpair="none required" - else -@@ -4019,7 +4008,7 @@ rm -f conftest* - test "$ac_cv_search_socketpair" = "no" && for i in socket; do - LIBS="-l$i $ac_func_search_save_LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_socketpair="-l$i" - break -@@ -4062,14 +4051,14 @@ fi - # a situation. - - echo $ac_n "checking for library containing waddstr""... $ac_c" 1>&6 --echo "configure:4066: checking for library containing waddstr" >&5 -+echo "configure:4055: checking for library containing waddstr" >&5 - if eval "test \"`echo '$''{'ac_cv_search_waddstr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_func_search_save_LIBS="$LIBS" - ac_cv_search_waddstr="no" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_waddstr="none required" - else -@@ -4091,7 +4080,7 @@ rm -f conftest* - test "$ac_cv_search_waddstr" = "no" && for i in ncurses cursesX curses; do - LIBS="-l$i $ac_func_search_save_LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_waddstr="-l$i" - break -@@ -4141,14 +4130,14 @@ esac - # These are the libraries checked by Readline. - - echo $ac_n "checking for library containing tgetent""... $ac_c" 1>&6 --echo "configure:4145: checking for library containing tgetent" >&5 -+echo "configure:4134: checking for library containing tgetent" >&5 - if eval "test \"`echo '$''{'ac_cv_search_tgetent'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_func_search_save_LIBS="$LIBS" - ac_cv_search_tgetent="no" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_tgetent="none required" - else -@@ -4170,7 +4159,7 @@ rm -f conftest* - test "$ac_cv_search_tgetent" = "no" && for i in termcap tinfo curses ncurses; do - LIBS="-l$i $ac_func_search_save_LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_tgetent="-l$i" - break -@@ -4215,12 +4204,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 --echo "configure:4219: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:4208: checking for $ac_hdr that defines DIR" >&5 - if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include <$ac_hdr> -@@ -4228,7 +4217,7 @@ int main() { - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:4232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -4253,7 +4242,7 @@ done - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then - echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 --echo "configure:4257: checking for opendir in -ldir" >&5 -+echo "configure:4246: checking for opendir in -ldir" >&5 - ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4261,7 +4250,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-ldir $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4294,7 +4283,7 @@ fi - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:4298: checking for opendir in -lx" >&5 -+echo "configure:4287: checking for opendir in -lx" >&5 - ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4302,7 +4291,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lx $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4336,12 +4325,12 @@ fi - fi - - echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 --echo "configure:4340: checking whether stat file-mode macros are broken" >&5 -+echo "configure:4329: checking whether stat file-mode macros are broken" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -4392,12 +4381,12 @@ EOF - fi - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:4396: checking for ANSI C header files" >&5 -+echo "configure:4385: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -4405,7 +4394,7 @@ else - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4422,7 +4411,7 @@ rm -f conftest* - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -4440,7 +4429,7 @@ fi - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -4461,7 +4450,7 @@ if test "$cross_compiling" = yes; then - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -4472,7 +4461,7 @@ if (XOR (islower (i), ISLOWER (i)) || to - exit (0); } - - EOF --if { (eval echo configure:4476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -4499,17 +4488,17 @@ for ac_hdr in link.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4503: checking for $ac_hdr" >&5 -+echo "configure:4492: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4539,17 +4528,17 @@ for ac_hdr in machine/reg.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4543: checking for $ac_hdr" >&5 -+echo "configure:4532: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4579,17 +4568,17 @@ for ac_hdr in nlist.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4583: checking for $ac_hdr" >&5 -+echo "configure:4572: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4619,17 +4608,17 @@ for ac_hdr in poll.h sys/poll.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4623: checking for $ac_hdr" >&5 -+echo "configure:4612: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4659,17 +4648,17 @@ for ac_hdr in proc_service.h thread_db.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4663: checking for $ac_hdr" >&5 -+echo "configure:4652: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4699,17 +4688,17 @@ for ac_hdr in stddef.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4703: checking for $ac_hdr" >&5 -+echo "configure:4692: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4739,17 +4728,17 @@ for ac_hdr in stdlib.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4743: checking for $ac_hdr" >&5 -+echo "configure:4732: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4779,17 +4768,17 @@ for ac_hdr in stdint.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4783: checking for $ac_hdr" >&5 -+echo "configure:4772: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4819,17 +4808,17 @@ for ac_hdr in string.h memory.h strings. - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4823: checking for $ac_hdr" >&5 -+echo "configure:4812: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4859,17 +4848,17 @@ for ac_hdr in sys/fault.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4863: checking for $ac_hdr" >&5 -+echo "configure:4852: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4899,17 +4888,17 @@ for ac_hdr in sys/file.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4903: checking for $ac_hdr" >&5 -+echo "configure:4892: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4939,17 +4928,17 @@ for ac_hdr in sys/filio.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4943: checking for $ac_hdr" >&5 -+echo "configure:4932: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4979,17 +4968,17 @@ for ac_hdr in sys/ioctl.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4983: checking for $ac_hdr" >&5 -+echo "configure:4972: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5019,17 +5008,17 @@ for ac_hdr in sys/param.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5023: checking for $ac_hdr" >&5 -+echo "configure:5012: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5059,17 +5048,17 @@ for ac_hdr in sys/proc.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5063: checking for $ac_hdr" >&5 -+echo "configure:5052: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5099,17 +5088,17 @@ for ac_hdr in sys/procfs.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5103: checking for $ac_hdr" >&5 -+echo "configure:5092: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5139,17 +5128,17 @@ for ac_hdr in sys/ptrace.h ptrace.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5143: checking for $ac_hdr" >&5 -+echo "configure:5132: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5179,17 +5168,17 @@ for ac_hdr in sys/reg.h sys/debugreg.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5183: checking for $ac_hdr" >&5 -+echo "configure:5172: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5219,17 +5208,17 @@ for ac_hdr in sys/select.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5223: checking for $ac_hdr" >&5 -+echo "configure:5212: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5259,17 +5248,17 @@ for ac_hdr in sys/syscall.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5263: checking for $ac_hdr" >&5 -+echo "configure:5252: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5299,17 +5288,17 @@ for ac_hdr in sys/types.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5303: checking for $ac_hdr" >&5 -+echo "configure:5292: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5339,17 +5328,17 @@ for ac_hdr in sys/user.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5343: checking for $ac_hdr" >&5 -+echo "configure:5332: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5379,17 +5368,17 @@ for ac_hdr in sys/wait.h wait.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5383: checking for $ac_hdr" >&5 -+echo "configure:5372: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5419,17 +5408,17 @@ for ac_hdr in termios.h termio.h sgtty.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5423: checking for $ac_hdr" >&5 -+echo "configure:5412: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5459,17 +5448,17 @@ for ac_hdr in unistd.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5463: checking for $ac_hdr" >&5 -+echo "configure:5452: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5512,17 +5501,17 @@ for ac_hdr in curses.h cursesX.h ncurses - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5516: checking for $ac_hdr" >&5 -+echo "configure:5505: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5555,17 +5544,17 @@ for ac_hdr in ctype.h time.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:5559: checking for $ac_hdr" >&5 -+echo "configure:5548: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5593,12 +5582,12 @@ done - - - echo $ac_n "checking for member st_blocks in struct stat""... $ac_c" 1>&6 --echo "configure:5597: checking for member st_blocks in struct stat" >&5 -+echo "configure:5586: checking for member st_blocks in struct stat" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_struct_stat_with_st_blocks_member'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -5606,7 +5595,7 @@ int main() { - struct stat st; (void) st.st_blocks; - ; return 0; } - EOF --if { (eval echo configure:5610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_struct_stat_with_st_blocks_member=yes - else -@@ -5634,12 +5623,12 @@ for ac_func in getopt - do - ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 --echo "configure:5638: checking whether $ac_func is declared" >&5 -+echo "configure:5627: checking whether $ac_func is declared" >&5 - if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "gcc_cv_have_decl_$ac_func=yes" - else -@@ -5688,12 +5677,12 @@ fi - # ------------------ # - - echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:5692: checking return type of signal handlers" >&5 -+echo "configure:5681: checking return type of signal handlers" >&5 - if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -5710,7 +5699,7 @@ int main() { - int i; - ; return 0; } - EOF --if { (eval echo configure:5714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void - else -@@ -5734,12 +5723,12 @@ EOF - # ------------------------------------- # - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:5738: checking for working const" >&5 -+echo "configure:5727: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -5809,21 +5798,21 @@ EOF - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:5813: checking for inline" >&5 -+echo "configure:5802: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -5856,19 +5845,19 @@ esac - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 --echo "configure:5860: checking for working alloca.h" >&5 -+echo "configure:5849: checking for working alloca.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:5872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes - else -@@ -5889,12 +5878,12 @@ EOF - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:5893: checking for alloca" >&5 -+echo "configure:5882: checking for alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_alloca_works=yes - else -@@ -5954,12 +5943,12 @@ EOF - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:5958: checking whether alloca needs Cray hooks" >&5 -+echo "configure:5947: checking whether alloca needs Cray hooks" >&5 - if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&6 - if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:5988: checking for $ac_func" >&5 -+echo "configure:5977: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6039,7 +6028,7 @@ done - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:6043: checking stack direction for C alloca" >&5 -+echo "configure:6032: checking stack direction for C alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6047,7 +6036,7 @@ else - ac_cv_c_stack_direction=0 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:6059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_stack_direction=1 - else -@@ -6091,17 +6080,17 @@ for ac_hdr in unistd.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6095: checking for $ac_hdr" >&5 -+echo "configure:6084: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6130,12 +6119,12 @@ done - for ac_func in getpagesize - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6134: checking for $ac_func" >&5 -+echo "configure:6123: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6183,7 +6172,7 @@ fi - done - - echo $ac_n "checking for working mmap""... $ac_c" 1>&6 --echo "configure:6187: checking for working mmap" >&5 -+echo "configure:6176: checking for working mmap" >&5 - if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6191,7 +6180,7 @@ else - ac_cv_func_mmap_fixed_mapped=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:6324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_mmap_fixed_mapped=yes - else -@@ -6354,12 +6343,12 @@ EOF - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:6358: checking for pid_t" >&5 -+echo "configure:6347: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -6388,17 +6377,17 @@ fi - - ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 --echo "configure:6392: checking for vfork.h" >&5 -+echo "configure:6381: checking for vfork.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6423,18 +6412,18 @@ else - fi - - echo $ac_n "checking for working vfork""... $ac_c" 1>&6 --echo "configure:6427: checking for working vfork" >&5 -+echo "configure:6416: checking for working vfork" >&5 - if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test "$cross_compiling" = yes; then - echo $ac_n "checking for vfork""... $ac_c" 1>&6 --echo "configure:6433: checking for vfork" >&5 -+echo "configure:6422: checking for vfork" >&5 - if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_vfork=yes" - else -@@ -6479,7 +6468,7 @@ fi - ac_cv_func_vfork_works=$ac_cv_func_vfork - else - cat > conftest.$ac_ext < -@@ -6574,7 +6563,7 @@ main() { - } - } - EOF --if { (eval echo configure:6578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:6567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_vfork_works=yes - else -@@ -6599,12 +6588,12 @@ fi - for ac_func in canonicalize_file_name realpath - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6603: checking for $ac_func" >&5 -+echo "configure:6592: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6654,12 +6643,12 @@ done - for ac_func in poll - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6658: checking for $ac_func" >&5 -+echo "configure:6647: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6709,12 +6698,12 @@ done - for ac_func in pread64 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6713: checking for $ac_func" >&5 -+echo "configure:6702: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6764,12 +6753,12 @@ done - for ac_func in sbrk - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6768: checking for $ac_func" >&5 -+echo "configure:6757: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6819,12 +6808,12 @@ done - for ac_func in setpgid setpgrp - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6823: checking for $ac_func" >&5 -+echo "configure:6812: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6874,12 +6863,12 @@ done - for ac_func in sigaction sigprocmask sigsetmask - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6878: checking for $ac_func" >&5 -+echo "configure:6867: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6929,12 +6918,12 @@ done - for ac_func in socketpair - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6933: checking for $ac_func" >&5 -+echo "configure:6922: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6984,12 +6973,12 @@ done - for ac_func in syscall - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6988: checking for $ac_func" >&5 -+echo "configure:6977: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7039,12 +7028,12 @@ done - for ac_func in ttrace - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7043: checking for $ac_func" >&5 -+echo "configure:7032: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7094,12 +7083,12 @@ done - for ac_func in wborder - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7098: checking for $ac_func" >&5 -+echo "configure:7087: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7165,12 +7154,12 @@ for ac_func in ptrace - do - ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 --echo "configure:7169: checking whether $ac_func is declared" >&5 -+echo "configure:7158: checking whether $ac_func is declared" >&5 - if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "gcc_cv_have_decl_$ac_func=yes" - else -@@ -7218,19 +7207,19 @@ fi - - # Check return type. - echo $ac_n "checking return type of ptrace""... $ac_c" 1>&6 --echo "configure:7222: checking return type of ptrace" >&5 -+echo "configure:7211: checking return type of ptrace" >&5 - if eval "test \"`echo '$''{'gdb_cv_func_ptrace_ret'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_func_ptrace_ret='int' - else -@@ -7249,7 +7238,7 @@ EOF - - # Check argument types. - echo $ac_n "checking types of arguments for ptrace""... $ac_c" 1>&6 --echo "configure:7253: checking types of arguments for ptrace" >&5 -+echo "configure:7242: checking types of arguments for ptrace" >&5 - if eval "test \"`echo '$''{'gdb_cv_func_ptrace_args'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7259,7 +7248,7 @@ for gdb_arg1 in 'int' 'long'; do - for gdb_arg3 in 'int *' 'caddr_t' 'int' 'long'; do - for gdb_arg4 in 'int' 'long'; do - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_func_ptrace_args="$gdb_arg1,$gdb_arg2,$gdb_arg3,$gdb_arg4"; - break 4; -@@ -7280,7 +7269,7 @@ fi - rm -f conftest* - for gdb_arg5 in 'int *' 'int' 'long'; do - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - gdb_cv_func_ptrace_args="$gdb_arg1,$gdb_arg2,$gdb_arg3,$gdb_arg4,$gdb_arg5"; -@@ -7328,7 +7317,7 @@ fi - - if test "$cross_compiling" = no; then - echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 --echo "configure:7332: checking whether setpgrp takes no argument" >&5 -+echo "configure:7321: checking whether setpgrp takes no argument" >&5 - if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7336,7 +7325,7 @@ else - { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:7349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_setpgrp_void=no - else -@@ -7381,12 +7370,12 @@ fi - - else - echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 --echo "configure:7385: checking whether setpgrp takes no argument" >&5 -+echo "configure:7374: checking whether setpgrp takes no argument" >&5 - if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7400,7 +7389,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:7404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_func_setpgrp_void=no - else -@@ -7424,12 +7413,12 @@ fi - # Check if sigsetjmp is available. Using AC_CHECK_FUNCS won't do - # since sigsetjmp might only be defined as a macro. - echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 --echo "configure:7428: checking for sigsetjmp" >&5 -+echo "configure:7417: checking for sigsetjmp" >&5 - if eval "test \"`echo '$''{'gdb_cv_func_sigsetjmp'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7438,7 +7427,7 @@ int main() { - sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1); - ; return 0; } - EOF --if { (eval echo configure:7442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_func_sigsetjmp=yes - else -@@ -7464,12 +7453,12 @@ gdb_use_included_regex=yes - # However, if the system regex is GNU regex, then default to *not* - # using the included regex. - echo $ac_n "checking for GNU regex""... $ac_c" 1>&6 --echo "configure:7468: checking for GNU regex" >&5 -+echo "configure:7457: checking for GNU regex" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_gnu_regex'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { -@@ -7479,7 +7468,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:7483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_gnu_regex=yes - else -@@ -7513,12 +7502,12 @@ fi - - # See if defines `struct thread' with a td_pcb member. - echo $ac_n "checking for td_pcb in struct thread""... $ac_c" 1>&6 --echo "configure:7517: checking for td_pcb in struct thread" >&5 -+echo "configure:7506: checking for td_pcb in struct thread" >&5 - if eval "test \"`echo '$''{'gdb_cv_struct_thread_td_pcb'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7526,7 +7515,7 @@ int main() { - struct thread td; td.td_pcb; - ; return 0; } - EOF --if { (eval echo configure:7530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_struct_thread_td_pcb=yes - else -@@ -7548,12 +7537,12 @@ fi - - # See if defines `struct lwp`. - echo $ac_n "checking for struct lwp""... $ac_c" 1>&6 --echo "configure:7552: checking for struct lwp" >&5 -+echo "configure:7541: checking for struct lwp" >&5 - if eval "test \"`echo '$''{'gdb_cv_struct_lwp'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7561,7 +7550,7 @@ int main() { - struct lwp l; - ; return 0; } - EOF --if { (eval echo configure:7565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_struct_lwp=yes - else -@@ -7583,12 +7572,12 @@ fi - - # See if degines `struct reg'. - echo $ac_n "checking for struct reg in machine/reg.h""... $ac_c" 1>&6 --echo "configure:7587: checking for struct reg in machine/reg.h" >&5 -+echo "configure:7576: checking for struct reg in machine/reg.h" >&5 - if eval "test \"`echo '$''{'gdb_cv_struct_reg'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7596,7 +7585,7 @@ int main() { - struct reg r; - ; return 0; } - EOF --if { (eval echo configure:7600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_struct_reg=yes - else -@@ -7619,19 +7608,19 @@ fi - # See if supports the %fs and %gs i386 segment registers. - # Older i386 BSD's don't have the r_fs and r_gs members of `struct reg'. - echo $ac_n "checking for r_fs in struct reg""... $ac_c" 1>&6 --echo "configure:7623: checking for r_fs in struct reg" >&5 -+echo "configure:7612: checking for r_fs in struct reg" >&5 - if eval "test \"`echo '$''{'gdb_cv_struct_reg_r_fs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - struct reg r; r.r_fs; - ; return 0; } - EOF --if { (eval echo configure:7635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_struct_reg_r_fs=yes - else -@@ -7651,19 +7640,19 @@ EOF - - fi - echo $ac_n "checking for r_gs in struct reg""... $ac_c" 1>&6 --echo "configure:7655: checking for r_gs in struct reg" >&5 -+echo "configure:7644: checking for r_gs in struct reg" >&5 - if eval "test \"`echo '$''{'gdb_cv_struct_reg_r_gs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - struct reg r; r.r_gs; - ; return 0; } - EOF --if { (eval echo configure:7667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_struct_reg_r_gs=yes - else -@@ -7685,19 +7674,19 @@ fi - - # See if provides the PTRACE_GETREGS request. - echo $ac_n "checking for PTRACE_GETREGS""... $ac_c" 1>&6 --echo "configure:7689: checking for PTRACE_GETREGS" >&5 -+echo "configure:7678: checking for PTRACE_GETREGS" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getregs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - PTRACE_GETREGS; - ; return 0; } - EOF --if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_ptrace_getregs=yes - else -@@ -7719,19 +7708,19 @@ fi - - # See if provides the PTRACE_GETFPXREGS request. - echo $ac_n "checking for PTRACE_GETFPXREGS""... $ac_c" 1>&6 --echo "configure:7723: checking for PTRACE_GETFPXREGS" >&5 -+echo "configure:7712: checking for PTRACE_GETFPXREGS" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getfpxregs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - PTRACE_GETFPXREGS; - ; return 0; } - EOF --if { (eval echo configure:7735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_ptrace_getfpxregs=yes - else -@@ -7753,12 +7742,12 @@ fi - - # See if provides the PT_GETDBREGS request. - echo $ac_n "checking for PT_GETDBREGS""... $ac_c" 1>&6 --echo "configure:7757: checking for PT_GETDBREGS" >&5 -+echo "configure:7746: checking for PT_GETDBREGS" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_pt_getdbregs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7766,7 +7755,7 @@ int main() { - PT_GETDBREGS; - ; return 0; } - EOF --if { (eval echo configure:7770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_pt_getdbregs=yes - else -@@ -7788,12 +7777,12 @@ fi - - # See if provides the PT_GETXMMREGS request. - echo $ac_n "checking for PT_GETXMMREGS""... $ac_c" 1>&6 --echo "configure:7792: checking for PT_GETXMMREGS" >&5 -+echo "configure:7781: checking for PT_GETXMMREGS" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_pt_getxmmregs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -7801,7 +7790,7 @@ int main() { - PT_GETXMMREGS; - ; return 0; } - EOF --if { (eval echo configure:7805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_pt_getxmmregs=yes - else -@@ -7824,19 +7813,19 @@ fi - # See if stdint.h provides the uintptr_t type. - # Autoconf 2.5X has an improved AC_CHECK_TYPE which will simplify this. - echo $ac_n "checking for uintptr_t in stdint.h""... $ac_c" 1>&6 --echo "configure:7828: checking for uintptr_t in stdint.h" >&5 -+echo "configure:7817: checking for uintptr_t in stdint.h" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_uintptr_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - uintptr_t foo = 0; - ; return 0; } - EOF --if { (eval echo configure:7840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_uintptr_t=yes - else -@@ -7857,12 +7846,12 @@ EOF - fi - - echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6 --echo "configure:7861: checking whether malloc must be declared" >&5 -+echo "configure:7850: checking whether malloc must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7883,7 +7872,7 @@ int main() { - char *(*pfn) = (char *(*)) malloc - ; return 0; } - EOF --if { (eval echo configure:7887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_malloc=no - else -@@ -7904,12 +7893,12 @@ EOF - fi - - echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6 --echo "configure:7908: checking whether realloc must be declared" >&5 -+echo "configure:7897: checking whether realloc must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7930,7 +7919,7 @@ int main() { - char *(*pfn) = (char *(*)) realloc - ; return 0; } - EOF --if { (eval echo configure:7934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_realloc=no - else -@@ -7951,12 +7940,12 @@ EOF - fi - - echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6 --echo "configure:7955: checking whether free must be declared" >&5 -+echo "configure:7944: checking whether free must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -7977,7 +7966,7 @@ int main() { - char *(*pfn) = (char *(*)) free - ; return 0; } - EOF --if { (eval echo configure:7981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_free=no - else -@@ -7998,12 +7987,12 @@ EOF - fi - - echo $ac_n "checking whether strerror must be declared""... $ac_c" 1>&6 --echo "configure:8002: checking whether strerror must be declared" >&5 -+echo "configure:7991: checking whether strerror must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_strerror'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -8024,7 +8013,7 @@ int main() { - char *(*pfn) = (char *(*)) strerror - ; return 0; } - EOF --if { (eval echo configure:8028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_strerror=no - else -@@ -8045,12 +8034,12 @@ EOF - fi - - echo $ac_n "checking whether strdup must be declared""... $ac_c" 1>&6 --echo "configure:8049: checking whether strdup must be declared" >&5 -+echo "configure:8038: checking whether strdup must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_strdup'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -8071,7 +8060,7 @@ int main() { - char *(*pfn) = (char *(*)) strdup - ; return 0; } - EOF --if { (eval echo configure:8075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_strdup=no - else -@@ -8092,12 +8081,12 @@ EOF - fi - - echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6 --echo "configure:8096: checking whether strstr must be declared" >&5 -+echo "configure:8085: checking whether strstr must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -8118,7 +8107,7 @@ int main() { - char *(*pfn) = (char *(*)) strstr - ; return 0; } - EOF --if { (eval echo configure:8122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_strstr=no - else -@@ -8139,12 +8128,12 @@ EOF - fi - - echo $ac_n "checking whether canonicalize_file_name must be declared""... $ac_c" 1>&6 --echo "configure:8143: checking whether canonicalize_file_name must be declared" >&5 -+echo "configure:8132: checking whether canonicalize_file_name must be declared" >&5 - if eval "test \"`echo '$''{'bfd_cv_decl_needed_canonicalize_file_name'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -8165,7 +8154,7 @@ int main() { - char *(*pfn) = (char *(*)) canonicalize_file_name - ; return 0; } - EOF --if { (eval echo configure:8169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_decl_needed_canonicalize_file_name=no - else -@@ -8191,9 +8180,9 @@ fi - # could be expunged. --jsm 1999-03-22 - - echo $ac_n "checking for HPUX save_state structure""... $ac_c" 1>&6 --echo "configure:8195: checking for HPUX save_state structure" >&5 -+echo "configure:8184: checking for HPUX save_state structure" >&5 - cat > conftest.$ac_ext < - EOF -@@ -8208,7 +8197,7 @@ fi - rm -f conftest* - - cat > conftest.$ac_ext < - EOF -@@ -8285,12 +8274,12 @@ fi - - if test "$ac_cv_header_sys_procfs_h" = yes; then - echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8289: checking for pstatus_t in sys/procfs.h" >&5 -+echo "configure:8278: checking for pstatus_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_pstatus_t=yes - else -@@ -8321,12 +8310,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6 - - echo $ac_n "checking for prrun_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8325: checking for prrun_t in sys/procfs.h" >&5 -+echo "configure:8314: checking for prrun_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prrun_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prrun_t=yes - else -@@ -8357,12 +8346,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prrun_t" 1>&6 - - echo $ac_n "checking for gregset_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8361: checking for gregset_t in sys/procfs.h" >&5 -+echo "configure:8350: checking for gregset_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_gregset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_gregset_t=yes - else -@@ -8393,12 +8382,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_gregset_t" 1>&6 - - echo $ac_n "checking for fpregset_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8397: checking for fpregset_t in sys/procfs.h" >&5 -+echo "configure:8386: checking for fpregset_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_fpregset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_fpregset_t=yes - else -@@ -8429,12 +8418,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_fpregset_t" 1>&6 - - echo $ac_n "checking for prgregset_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8433: checking for prgregset_t in sys/procfs.h" >&5 -+echo "configure:8422: checking for prgregset_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prgregset_t=yes - else -@@ -8465,12 +8454,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset_t" 1>&6 - - echo $ac_n "checking for prfpregset_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8469: checking for prfpregset_t in sys/procfs.h" >&5 -+echo "configure:8458: checking for prfpregset_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prfpregset_t=yes - else -@@ -8501,12 +8490,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset_t" 1>&6 - - echo $ac_n "checking for prgregset32_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8505: checking for prgregset32_t in sys/procfs.h" >&5 -+echo "configure:8494: checking for prgregset32_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prgregset32_t=yes - else -@@ -8537,12 +8526,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset32_t" 1>&6 - - echo $ac_n "checking for prfpregset32_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8541: checking for prfpregset32_t in sys/procfs.h" >&5 -+echo "configure:8530: checking for prfpregset32_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prfpregset32_t=yes - else -@@ -8573,12 +8562,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset32_t" 1>&6 - - echo $ac_n "checking for lwpid_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8577: checking for lwpid_t in sys/procfs.h" >&5 -+echo "configure:8566: checking for lwpid_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_lwpid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_lwpid_t=yes - else -@@ -8609,12 +8598,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_lwpid_t" 1>&6 - - echo $ac_n "checking for psaddr_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8613: checking for psaddr_t in sys/procfs.h" >&5 -+echo "configure:8602: checking for psaddr_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_psaddr_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_psaddr_t=yes - else -@@ -8645,12 +8634,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_psaddr_t" 1>&6 - - echo $ac_n "checking for prsysent_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8649: checking for prsysent_t in sys/procfs.h" >&5 -+echo "configure:8638: checking for prsysent_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prsysent_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_prsysent_t=yes - else -@@ -8681,12 +8670,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_prsysent_t" 1>&6 - - echo $ac_n "checking for pr_sigset_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8685: checking for pr_sigset_t in sys/procfs.h" >&5 -+echo "configure:8674: checking for pr_sigset_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_sigset_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_pr_sigset_t=yes - else -@@ -8717,12 +8706,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_pr_sigset_t" 1>&6 - - echo $ac_n "checking for pr_sigaction64_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8721: checking for pr_sigaction64_t in sys/procfs.h" >&5 -+echo "configure:8710: checking for pr_sigaction64_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_sigaction64_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_pr_sigaction64_t=yes - else -@@ -8753,12 +8742,12 @@ EOF - echo "$ac_t""$bfd_cv_have_sys_procfs_type_pr_sigaction64_t" 1>&6 - - echo $ac_n "checking for pr_siginfo64_t in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8757: checking for pr_siginfo64_t in sys/procfs.h" >&5 -+echo "configure:8746: checking for pr_siginfo64_t in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_siginfo64_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - bfd_cv_have_sys_procfs_type_pr_siginfo64_t=yes - else -@@ -8794,7 +8783,7 @@ EOF - - if test $bfd_cv_have_sys_procfs_type_prfpregset_t = yes; then - echo $ac_n "checking whether prfpregset_t type is broken""... $ac_c" 1>&6 --echo "configure:8798: checking whether prfpregset_t type is broken" >&5 -+echo "configure:8787: checking whether prfpregset_t type is broken" >&5 - if eval "test \"`echo '$''{'gdb_cv_prfpregset_t_broken'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -8802,7 +8791,7 @@ else - gdb_cv_prfpregset_t_broken=yes - else - cat > conftest.$ac_ext < - int main () -@@ -8812,7 +8801,7 @@ else - return 0; - } - EOF --if { (eval echo configure:8816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:8805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - gdb_cv_prfpregset_t_broken=no - else -@@ -8837,12 +8826,12 @@ EOF - - - echo $ac_n "checking for PIOCSET ioctl entry in sys/procfs.h""... $ac_c" 1>&6 --echo "configure:8841: checking for PIOCSET ioctl entry in sys/procfs.h" >&5 -+echo "configure:8830: checking for PIOCSET ioctl entry in sys/procfs.h" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_procfs_piocset'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -8855,7 +8844,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:8859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_procfs_piocset=yes - else -@@ -8879,19 +8868,19 @@ fi - if test ${host} = ${target} ; then - - echo $ac_n "checking for member l_addr in struct link_map""... $ac_c" 1>&6 --echo "configure:8883: checking for member l_addr in struct link_map" >&5 -+echo "configure:8872: checking for member l_addr in struct link_map" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map_with_l_members'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - struct link_map lm; (void) lm.l_addr; - ; return 0; } - EOF --if { (eval echo configure:8895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_struct_link_map_with_l_members=yes - else -@@ -8913,12 +8902,12 @@ EOF - - - echo $ac_n "checking for member lm_addr in struct link_map""... $ac_c" 1>&6 --echo "configure:8917: checking for member lm_addr in struct link_map" >&5 -+echo "configure:8906: checking for member lm_addr in struct link_map" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map_with_lm_members'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -8926,7 +8915,7 @@ int main() { - struct link_map lm; (void) lm.lm_addr; - ; return 0; } - EOF --if { (eval echo configure:8930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_struct_link_map_with_lm_members=yes - else -@@ -8948,12 +8937,12 @@ EOF - - - echo $ac_n "checking for member som_addr in struct so_map""... $ac_c" 1>&6 --echo "configure:8952: checking for member som_addr in struct so_map" >&5 -+echo "configure:8941: checking for member som_addr in struct so_map" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_struct_so_map_with_som_members'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #ifdef HAVE_NLIST_H -@@ -8964,7 +8953,7 @@ int main() { - struct so_map lm; (void) lm.som_addr; - ; return 0; } - EOF --if { (eval echo configure:8968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_struct_so_map_with_som_members=yes - else -@@ -8986,12 +8975,12 @@ EOF - - - echo $ac_n "checking for struct link_map32 in sys/link.h""... $ac_c" 1>&6 --echo "configure:8990: checking for struct link_map32 in sys/link.h" >&5 -+echo "configure:8979: checking for struct link_map32 in sys/link.h" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -8999,7 +8988,7 @@ int main() { - struct link_map32 l; - ; return 0; } - EOF --if { (eval echo configure:9003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_struct_link_map32=yes - else -@@ -9026,12 +9015,12 @@ fi - - - echo $ac_n "checking for long long support in compiler""... $ac_c" 1>&6 --echo "configure:9030: checking for long long support in compiler" >&5 -+echo "configure:9019: checking for long long support in compiler" >&5 - if eval "test \"`echo '$''{'gdb_cv_c_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_c_long_long=yes - else -@@ -9063,7 +9052,7 @@ fi - - - echo $ac_n "checking for long long support in printf""... $ac_c" 1>&6 --echo "configure:9067: checking for long long support in printf" >&5 -+echo "configure:9056: checking for long long support in printf" >&5 - if eval "test \"`echo '$''{'gdb_cv_printf_has_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9071,7 +9060,7 @@ else - gdb_cv_printf_has_long_long=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - gdb_cv_printf_has_long_long=yes - else -@@ -9109,19 +9098,19 @@ echo "$ac_t""$gdb_cv_printf_has_long_lon - - - echo $ac_n "checking for long double support in compiler""... $ac_c" 1>&6 --echo "configure:9113: checking for long double support in compiler" >&5 -+echo "configure:9102: checking for long double support in compiler" >&5 - if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_long_double=yes - else -@@ -9143,7 +9132,7 @@ fi - - - echo $ac_n "checking for long double support in printf""... $ac_c" 1>&6 --echo "configure:9147: checking for long double support in printf" >&5 -+echo "configure:9136: checking for long double support in printf" >&5 - if eval "test \"`echo '$''{'gdb_cv_printf_has_long_double'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9151,7 +9140,7 @@ else - gdb_cv_printf_has_long_double=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - gdb_cv_printf_has_long_double=yes - else -@@ -9185,7 +9174,7 @@ echo "$ac_t""$gdb_cv_printf_has_long_dou - - - echo $ac_n "checking for long double support in scanf""... $ac_c" 1>&6 --echo "configure:9189: checking for long double support in scanf" >&5 -+echo "configure:9178: checking for long double support in scanf" >&5 - if eval "test \"`echo '$''{'gdb_cv_scanf_has_long_double'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9193,7 +9182,7 @@ else - gdb_cv_scanf_has_long_double=no - else - cat > conftest.$ac_ext < 3.14159 && f < 3.14160); - } - EOF --if { (eval echo configure:9207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - gdb_cv_scanf_has_long_double=yes - else -@@ -9228,7 +9217,7 @@ echo "$ac_t""$gdb_cv_scanf_has_long_doub - case ${host_os} in - aix*) - echo $ac_n "checking for -bbigtoc option""... $ac_c" 1>&6 --echo "configure:9232: checking for -bbigtoc option" >&5 -+echo "configure:9221: checking for -bbigtoc option" >&5 - if eval "test \"`echo '$''{'gdb_cv_bigtoc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9242,14 +9231,14 @@ else - - LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - : - else - echo "configure: failed program was:" >&5 -@@ -9273,7 +9262,7 @@ if test ${build} = ${host} -a ${host} = - case ${host_os} in - hpux*) - echo $ac_n "checking for HPUX/OSF thread support""... $ac_c" 1>&6 --echo "configure:9277: checking for HPUX/OSF thread support" >&5 -+echo "configure:9266: checking for HPUX/OSF thread support" >&5 - if test -f /usr/include/dce/cma_config.h ; then - if test "$GCC" = "yes" ; then - echo "$ac_t""yes" 1>&6 -@@ -9296,7 +9285,7 @@ EOF - # because version 0 (present on Solaris 2.4 or earlier) doesn't have - # the same API. - echo $ac_n "checking for Solaris thread debugging library""... $ac_c" 1>&6 --echo "configure:9300: checking for Solaris thread debugging library" >&5 -+echo "configure:9289: checking for Solaris thread debugging library" >&5 - if test -f /usr/lib/libthread_db.so.1 ; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -@@ -9306,7 +9295,7 @@ EOF - CONFIG_OBS="${CONFIG_OBS} sol-thread.o" - CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c" - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:9310: checking for dlopen in -ldl" >&5 -+echo "configure:9299: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9314,7 +9303,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -9357,17 +9346,17 @@ fi - # all symbols visible in the dynamic symbol table. - hold_ldflags=$LDFLAGS - echo $ac_n "checking for the ld -export-dynamic flag""... $ac_c" 1>&6 --echo "configure:9361: checking for the ld -export-dynamic flag" >&5 -+echo "configure:9350: checking for the ld -export-dynamic flag" >&5 - LDFLAGS="${LDFLAGS} -Wl,-export-dynamic" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - found=yes - else -@@ -9386,13 +9375,13 @@ rm -f conftest* - # Sun randomly tweaked the prototypes in - # at one point. - echo $ac_n "checking if is old""... $ac_c" 1>&6 --echo "configure:9390: checking if is old" >&5 -+echo "configure:9379: checking if is old" >&5 - if eval "test \"`echo '$''{'gdb_cv_proc_service_is_old'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext < -@@ -9403,7 +9392,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:9407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_proc_service_is_old=no - else -@@ -9429,12 +9418,12 @@ EOF - ;; - aix*) - echo $ac_n "checking for AiX thread debugging library""... $ac_c" 1>&6 --echo "configure:9433: checking for AiX thread debugging library" >&5 -+echo "configure:9422: checking for AiX thread debugging library" >&5 - if eval "test \"`echo '$''{'gdb_cv_have_aix_thread_debug'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { -@@ -9443,7 +9432,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:9447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_have_aix_thread_debug=yes - else -@@ -9468,19 +9457,19 @@ fi - - if test "x$ac_cv_header_thread_db_h" = "xyes"; then - echo $ac_n "checking whether has TD_NOTALLOC""... $ac_c" 1>&6 --echo "configure:9472: checking whether has TD_NOTALLOC" >&5 -+echo "configure:9461: checking whether has TD_NOTALLOC" >&5 - if eval "test \"`echo '$''{'gdb_cv_thread_db_h_has_td_notalloc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - int i = TD_NOTALLOC; - ; return 0; } - EOF --if { (eval echo configure:9484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_thread_db_h_has_td_notalloc=yes - else -@@ -9505,19 +9494,19 @@ fi - - if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then - echo $ac_n "checking whether has __NR_tkill""... $ac_c" 1>&6 --echo "configure:9509: checking whether has __NR_tkill" >&5 -+echo "configure:9498: checking whether has __NR_tkill" >&5 - if eval "test \"`echo '$''{'gdb_cv_sys_syscall_h_has_tkill'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - int i = __NR_tkill; - ; return 0; } - EOF --if { (eval echo configure:9521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - gdb_cv_sys_syscall_h_has_tkill=yes - else -@@ -9585,7 +9574,8 @@ fi +Index: gdb-6.5/gdb/configure +=================================================================== +--- gdb-6.5.orig/gdb/configure 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/configure 2006-07-11 02:47:23.000000000 -0300 +@@ -20125,7 +20125,8 @@ fi # gdb/doc/gdbint.texinfo. build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \ - -Wformat -Wparentheses -Wpointer-arith -Wuninitialized -Wformat-nonliteral \ ---Wunused-label -Wunused-function" + -Wformat -Wparentheses -Wpointer-arith -Wformat-nonliteral \ +--Wunused-label -Wunused-function -Wno-pointer-sign" +-Wunused-label -Wunused-function -Wno-pointer-sign -Wno-unused \ +-Wp,-U_FORTIFY_SOURCE" - # Up for debate: -Wswitch -Wcomment -trigraphs -Wtrigraphs - # -Wunused-function -Wunused-variable -Wunused-value - # -Wchar-subscripts -Wtraditional -Wshadow -Wcast-qual -@@ -9629,7 +9619,7 @@ WERROR_CFLAGS="" - if test "x${build_warnings}" != x -a "x$GCC" = xyes - then - echo $ac_n "checking compiler warning flags""... $ac_c" 1>&6 --echo "configure:9633: checking compiler warning flags" >&5 -+echo "configure:9623: checking compiler warning flags" >&5 - # Separate out the -Werror flag as some files just cannot be - # compiled with it enabled. - for w in ${build_warnings}; do -@@ -9639,14 +9629,14 @@ echo "configure:9633: checking compiler - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $w" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - WARN_CFLAGS="${WARN_CFLAGS} $w" - else -@@ -9664,12 +9654,12 @@ fi - - # In the Cygwin environment, we need some additional flags. - echo $ac_n "checking for cygwin""... $ac_c" 1>&6 --echo "configure:9668: checking for cygwin" >&5 -+echo "configure:9658: checking for cygwin" >&5 - if eval "test \"`echo '$''{'gdb_cv_os_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&6 --echo "configure:9758: checking for Tcl configuration" >&5 -+echo "configure:9748: checking for Tcl configuration" >&5 - if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9863,7 +9853,7 @@ if test "${with_tkconfig+set}" = set; th - fi - - echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6 --echo "configure:9867: checking for Tk configuration" >&5 -+echo "configure:9857: checking for Tk configuration" >&5 - if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -9965,7 +9955,7 @@ fi - - no_tcl=true - echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6 --echo "configure:9969: checking for Tcl private headers. dir=${configdir}" >&5 -+echo "configure:9959: checking for Tcl private headers. dir=${configdir}" >&5 - # Check whether --with-tclinclude or --without-tclinclude was given. - if test "${with_tclinclude+set}" = set; then - withval="$with_tclinclude" -@@ -10031,17 +10021,17 @@ fi - if test x"${ac_cv_c_tclh}" = x ; then - ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6 --echo "configure:10035: checking for tclInt.h" >&5 -+echo "configure:10025: checking for tclInt.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:10045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:10035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -10101,7 +10091,7 @@ fi - # - no_tk=true - echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6 --echo "configure:10105: checking for Tk private headers" >&5 -+echo "configure:10095: checking for Tk private headers" >&5 - # Check whether --with-tkinclude or --without-tkinclude was given. - if test "${with_tkinclude+set}" = set; then - withval="$with_tkinclude" -@@ -10167,17 +10157,17 @@ fi - if test x"${ac_cv_c_tkh}" = x ; then - ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for tk.h""... $ac_c" 1>&6 --echo "configure:10171: checking for tk.h" >&5 -+echo "configure:10161: checking for tk.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:10181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:10171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -10223,7 +10213,7 @@ fi - - - echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6 --echo "configure:10227: checking for Itcl private headers. srcdir=${srcdir}" >&5 -+echo "configure:10217: checking for Itcl private headers. srcdir=${srcdir}" >&5 - if test x"${ac_cv_c_itclh}" = x ; then - for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do - if test -f $i/generic/itcl.h ; then -@@ -10246,7 +10236,7 @@ fi - - - echo $ac_n "checking for Itk private headers. srcdir=${srcdir}""... $ac_c" 1>&6 --echo "configure:10250: checking for Itk private headers. srcdir=${srcdir}" >&5 -+echo "configure:10240: checking for Itk private headers. srcdir=${srcdir}" >&5 - if test x"${ac_cv_c_itkh}" = x ; then - for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do - if test -f $i/generic/itk.h ; then -@@ -10294,7 +10284,7 @@ if test "${with_itclconfig+set}" = set; - fi - - echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6 --echo "configure:10298: checking for Itcl configuration" >&5 -+echo "configure:10288: checking for Itcl configuration" >&5 - if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10397,7 +10387,7 @@ if test "${with_itkconfig+set}" = set; t - fi - - echo $ac_n "checking for Itk configuration""... $ac_c" 1>&6 --echo "configure:10401: checking for Itk configuration" >&5 -+echo "configure:10391: checking for Itk configuration" >&5 - if eval "test \"`echo '$''{'ac_cv_c_itkconfig'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -10539,7 +10529,7 @@ fi - # Uses ac_ vars as temps to allow command line to override cache and checks. - # --without-x overrides everything else, but does not touch the cache. - echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:10543: checking for X" >&5 -+echo "configure:10533: checking for X" >&5 - - # Check whether --with-x or --without-x was given. - if test "${with_x+set}" = set; then -@@ -10601,12 +10591,12 @@ if test "$ac_x_includes" = NO; then - - # First, try using that file with no special directory specified. - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:10610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:10600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -10675,14 +10665,14 @@ if test "$ac_x_libraries" = NO; then - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" - # We can link X programs with no special library path. -@@ -10924,7 +10914,7 @@ fi - # We only build gdbserver automatically if host and target are the same. - if test "x$target" = "x$host"; then - echo $ac_n "checking whether gdbserver is supported on this host""... $ac_c" 1>&6 --echo "configure:10928: checking whether gdbserver is supported on this host" >&5 -+echo "configure:10918: checking whether gdbserver is supported on this host" >&5 - if test "x$build_gdbserver" = xyes; then - configdirs="$configdirs gdbserver" - echo "$ac_t""yes" 1>&6 -@@ -10997,12 +10987,12 @@ fi - - - echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 --echo "configure:11001: checking for Cygwin environment" >&5 -+echo "configure:10991: checking for Cygwin environment" >&5 - if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes - else -@@ -11030,19 +11020,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 - CYGWIN= - test "$ac_cv_cygwin" = yes && CYGWIN=yes - echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 --echo "configure:11034: checking for mingw32 environment" >&5 -+echo "configure:11024: checking for mingw32 environment" >&5 - if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes - else -@@ -11061,7 +11051,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y - - - echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 --echo "configure:11065: checking for executable suffix" >&5 -+echo "configure:11055: checking for executable suffix" >&5 - if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11071,10 +11061,10 @@ else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= -- if { (eval echo configure:11075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+ if { (eval echo configure:11065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in -- *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;; -+ *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done -@@ -11113,7 +11103,7 @@ fi - - - echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:11117: checking for iconv" >&5 -+echo "configure:11107: checking for iconv" >&5 - if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -11121,7 +11111,7 @@ else - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat > conftest.$ac_ext < - #include -@@ -11131,7 +11121,7 @@ iconv_t cd = iconv_open("",""); - iconv_close(cd); - ; return 0; } - EOF --if { (eval echo configure:11135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_func_iconv=yes - else -@@ -11143,7 +11133,7 @@ rm -f conftest* - am_save_LIBS="$LIBS" - LIBS="$LIBS -liconv" - cat > conftest.$ac_ext < - #include -@@ -11153,7 +11143,7 @@ iconv_t cd = iconv_open("",""); - iconv_close(cd); - ; return 0; } - EOF --if { (eval echo configure:11157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:11147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -@@ -11174,13 +11164,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 - EOF - - echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 --echo "configure:11178: checking for iconv declaration" >&5 -+echo "configure:11168: checking for iconv declaration" >&5 - if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext < -@@ -11199,7 +11189,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:11203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:11193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - am_cv_proto_iconv_arg1="" - else ---- gdb-6.3/gdb/mi/mi-cmd-env.c.fix 2005-03-17 17:23:35.000000000 -0500 -+++ gdb-6.3/gdb/mi/mi-cmd-env.c 2005-03-21 11:54:50.000000000 -0500 -@@ -1,6 +1,6 @@ - /* MI Command Set - environment commands. - -- Copyright 2002, 2003, 2004 Free Software Foundation, Inc. -+ Copyright 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - - Contributed by Red Hat Inc. + # GCC supports -Wuninitialized only with -O or -On, n != 0. + if test x${CFLAGS+set} = xset; then +Index: gdb-6.5/gdb/mi/mi-cmd-env.c +=================================================================== +--- gdb-6.5.orig/gdb/mi/mi-cmd-env.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/mi/mi-cmd-env.c 2006-07-11 02:47:23.000000000 -0300 @@ -126,7 +126,7 @@ mi_cmd_env_path (char *command, char **a static struct mi_opt opts[] = { @@ -4608,15 +34,10 @@ }; dont_repeat (); ---- gdb-6.3/gdb/mi/mi-getopt.c.fix 2005-03-17 17:39:02.000000000 -0500 -+++ gdb-6.3/gdb/mi/mi-getopt.c 2005-03-21 11:55:03.000000000 -0500 -@@ -1,5 +1,5 @@ - /* MI Command Set - MI Option Parser. -- Copyright 2000, 2001 Free Software Foundation, Inc. -+ Copyright 2000, 2001, 2005 Free Software Foundation, Inc. - Contributed by Cygnus Solutions (a Red Hat company). - - This file is part of GDB. +Index: gdb-6.5/gdb/mi/mi-getopt.c +=================================================================== +--- gdb-6.5.orig/gdb/mi/mi-getopt.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/mi/mi-getopt.c 2006-07-11 02:47:23.000000000 -0300 @@ -82,7 +82,7 @@ mi_valid_noargs (const char *prefix, int char *optarg; static struct mi_opt opts[] = @@ -4626,15 +47,10 @@ }; if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) == -1) ---- gdb-6.3/gdb/mi/mi-cmd-break.c.fix 2005-03-17 17:36:31.000000000 -0500 -+++ gdb-6.3/gdb/mi/mi-cmd-break.c 2005-03-21 11:54:31.000000000 -0500 -@@ -1,5 +1,5 @@ - /* MI Command Set - breakpoint and watchpoint commands. -- Copyright 2000, 2001, 2002 Free Software Foundation, Inc. -+ Copyright 2000, 2001, 2002, 2005 Free Software Foundation, Inc. - Contributed by Cygnus Solutions (a Red Hat company). - - This file is part of GDB. +Index: gdb-6.5/gdb/mi/mi-cmd-break.c +=================================================================== +--- gdb-6.5.orig/gdb/mi/mi-cmd-break.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/mi/mi-cmd-break.c 2006-07-11 02:47:23.000000000 -0300 @@ -90,7 +90,7 @@ mi_cmd_break_insert (char *command, char {"c", CONDITION_OPT, 1}, {"i", IGNORE_COUNT_OPT, 1}, @@ -4644,7 +60,7 @@ }; /* Parse arguments. It could be -r or -h or -t, or ``--'' -@@ -194,7 +194,7 @@ mi_cmd_break_watch (char *command, char +@@ -196,7 +196,7 @@ mi_cmd_break_watch (char *command, char { {"r", READ_OPT, 0}, {"a", ACCESS_OPT, 0}, @@ -4653,8 +69,10 @@ }; /* Parse arguments. */ ---- gdb-6.3/gdb/mi/mi-cmd-disas.c.fix 2005-03-17 17:38:40.000000000 -0500 -+++ gdb-6.3/gdb/mi/mi-cmd-disas.c 2005-03-17 17:38:51.000000000 -0500 +Index: gdb-6.5/gdb/mi/mi-cmd-disas.c +=================================================================== +--- gdb-6.5.orig/gdb/mi/mi-cmd-disas.c 2006-07-11 02:47:12.000000000 -0300 ++++ gdb-6.5/gdb/mi/mi-cmd-disas.c 2006-07-11 02:47:23.000000000 -0300 @@ -84,7 +84,7 @@ mi_cmd_disassemble (char *command, char {"n", NUM_OPT, 1}, {"s", START_OPT, 1}, @@ -4664,17 +82,11 @@ }; /* Get the options with their arguments. Keep track of what we ---- gdb-6.3/gdb/mi/mi-main.c.fix 2005-03-17 17:39:43.000000000 -0500 -+++ gdb-6.3/gdb/mi/mi-main.c 2005-03-21 11:55:18.000000000 -0500 -@@ -1,6 +1,6 @@ - /* MI Command Set. - -- Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, -+ Copyright 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, - Inc. - - Contributed by Cygnus Solutions (a Red Hat company). -@@ -779,7 +779,7 @@ mi_cmd_data_read_memory (char *command, +Index: gdb-6.5/gdb/mi/mi-main.c +=================================================================== +--- gdb-6.5.orig/gdb/mi/mi-main.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/mi/mi-main.c 2006-07-11 02:47:23.000000000 -0300 +@@ -773,7 +773,7 @@ mi_cmd_data_read_memory (char *command, static struct mi_opt opts[] = { {"o", OFFSET_OPT, 1}, @@ -4683,7 +95,7 @@ }; while (1) -@@ -981,7 +981,7 @@ mi_cmd_data_write_memory (char *command, +@@ -975,7 +975,7 @@ mi_cmd_data_write_memory (char *command, static struct mi_opt opts[] = { {"o", OFFSET_OPT, 1}, @@ -4692,16 +104,11 @@ }; while (1) ---- gdb-6.3/gdb/p-valprint.c.fix 2005-03-18 14:00:28.000000000 -0500 -+++ gdb-6.3/gdb/p-valprint.c 2005-03-21 11:52:54.000000000 -0500 -@@ -1,5 +1,5 @@ - /* Support for printing Pascal values for GDB, the GNU debugger. -- Copyright 2000, 2001, 2003 -+ Copyright 2000, 2001, 2003, 2005 - Free Software Foundation, Inc. - - This file is part of GDB. -@@ -739,7 +739,7 @@ pascal_object_print_value_fields (struct +Index: gdb-6.5/gdb/p-valprint.c +=================================================================== +--- gdb-6.5.orig/gdb/p-valprint.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/p-valprint.c 2006-07-11 02:47:23.000000000 -0300 +@@ -753,7 +753,7 @@ pascal_object_print_value_fields (struct int dont_print_statmem) { int i, len, n_baseclasses; @@ -4710,7 +117,7 @@ char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack); CHECK_TYPEDEF (type); -@@ -909,7 +909,7 @@ pascal_object_print_value (struct type * +@@ -922,7 +922,7 @@ pascal_object_print_value (struct type * enum val_prettyprint pretty, struct type **dont_print_vb) { @@ -4719,40 +126,12 @@ struct type **last_dont_print = (struct type **) obstack_next_free (&dont_print_vb_obstack); int i, n_baseclasses = TYPE_N_BASECLASSES (type); ---- gdb-6.3/gdb/cli/cli-cmds.c.fix 2005-03-17 17:08:30.000000000 -0500 -+++ gdb-6.3/gdb/cli/cli-cmds.c 2005-03-21 11:55:51.000000000 -0500 -@@ -1,6 +1,7 @@ - /* GDB CLI commands. - -- Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+ Copyright 2000, 2001, 2002, 2003, 2004, 2005 -+ Free Software Foundation, Inc. - - This file is part of GDB. - -@@ -652,7 +653,9 @@ static void - list_command (char *arg, int from_tty) - { - struct symtabs_and_lines sals, sals_end; -- struct symtab_and_line sal, sal_end, cursal; -+ struct symtab_and_line sal = {0}; -+ struct symtab_and_line cursal = {0}; -+ struct symtab_and_line sal_end = {0}; - struct symbol *sym; - char *arg1; - int no_end = 1; ---- gdb-6.3/gdb/cp-valprint.c.fix 2005-03-18 18:29:34.000000000 -0500 -+++ gdb-6.3/gdb/cp-valprint.c 2005-03-21 11:51:28.000000000 -0500 -@@ -1,6 +1,6 @@ - /* Support for printing C++ values for GDB, the GNU debugger. - Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, -- 2000, 2001, 2002, 2003 -+ 2000, 2001, 2002, 2003, 2005 - Free Software Foundation, Inc. - - This file is part of GDB. -@@ -233,7 +233,7 @@ cp_print_value_fields (struct type *type - struct type **dont_print_vb, int dont_print_statmem) +Index: gdb-6.5/gdb/cp-valprint.c +=================================================================== +--- gdb-6.5.orig/gdb/cp-valprint.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/cp-valprint.c 2006-07-11 02:47:23.000000000 -0300 +@@ -265,7 +265,7 @@ cp_print_value_fields (struct type *type + struct type **dont_print_vb,int dont_print_statmem) { int i, len, n_baseclasses; - struct obstack tmp_obstack; @@ -4760,17 +139,19 @@ char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack); int fields_seen = 0; -@@ -494,7 +494,7 @@ cp_print_value (struct type *type, struc - int format, int recurse, enum val_prettyprint pretty, - struct type **dont_print_vb) +@@ -524,7 +524,7 @@ cp_print_value (struct type *type, struc + struct ui_file *stream, int format, int recurse, + enum val_prettyprint pretty, struct type **dont_print_vb) { - struct obstack tmp_obstack; + struct obstack tmp_obstack = {0}; struct type **last_dont_print = (struct type **) obstack_next_free (&dont_print_vb_obstack); int i, n_baseclasses = TYPE_N_BASECLASSES (type); ---- gdb-6.3/gdb/tui/tui-layout.c.fix 2005-03-17 17:52:36.000000000 -0500 -+++ gdb-6.3/gdb/tui/tui-layout.c 2005-03-21 11:49:18.000000000 -0500 +Index: gdb-6.5/gdb/tui/tui-layout.c +=================================================================== +--- gdb-6.5.orig/gdb/tui/tui-layout.c 2006-07-11 02:47:12.000000000 -0300 ++++ gdb-6.5/gdb/tui/tui-layout.c 2006-07-11 02:47:23.000000000 -0300 @@ -755,7 +755,7 @@ show_source_disasm_command (void) if (TUI_DISASM_WIN == NULL) { @@ -4807,47 +188,35 @@ LOCATOR_WIN, 2 /* 1 */ , tui_term_width (), ---- gdb-6.3/gdb/testsuite/gdb.base/move-dir.h.fix 2005-03-21 21:25:55.000000000 -0500 -+++ gdb-6.3/gdb/testsuite/gdb.base/move-dir.h 2005-03-21 21:26:01.000000000 -0500 +Index: gdb-6.5/gdb/testsuite/gdb.base/move-dir.h +=================================================================== +--- gdb-6.5.orig/gdb/testsuite/gdb.base/move-dir.h 2006-07-11 02:47:12.000000000 -0300 ++++ gdb-6.5/gdb/testsuite/gdb.base/move-dir.h 2006-07-11 02:47:23.000000000 -0300 @@ -1,4 +1,4 @@ -#include +#include void other() { const char* ostring = "other"; ---- gdb-6.3/gdb/testsuite/gdb.base/sigrepeat.c.fix 2005-03-21 21:26:58.000000000 -0500 -+++ gdb-6.3/gdb/testsuite/gdb.base/sigrepeat.c 2005-03-21 21:27:33.000000000 -0500 -@@ -21,6 +21,7 @@ - #include +Index: gdb-6.5/gdb/testsuite/gdb.base/sigrepeat.c +=================================================================== +--- gdb-6.5.orig/gdb/testsuite/gdb.base/sigrepeat.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/testsuite/gdb.base/sigrepeat.c 2006-07-11 02:47:23.000000000 -0300 +@@ -22,6 +22,7 @@ + #include #include #include +#include #include - ---- gdb-6.3/gdb/s390-tdep.c.fix 2005-03-17 16:23:12.000000000 -0500 -+++ gdb-6.3/gdb/s390-tdep.c 2005-03-17 17:31:52.000000000 -0500 -@@ -1,6 +1,6 @@ - /* Target-dependent code for GDB, the GNU debugger. - -- Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+ Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - - Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) - for IBM Deutschland Entwicklung GmbH, IBM Corporation. -@@ -2734,6 +2734,9 @@ s390_return_value (struct gdbarch *gdbar + static volatile int done[2]; +Index: gdb-6.5/gdb/s390-tdep.c +=================================================================== +--- gdb-6.5.orig/gdb/s390-tdep.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/s390-tdep.c 2006-07-11 02:47:23.000000000 -0300 +@@ -2309,6 +2309,9 @@ s390_return_value (struct gdbarch *gdbar case RETURN_VALUE_STRUCT_CONVENTION: - error ("Cannot set function return value."); - break; -+ -+ default: -+ break; - } - } - else if (out) -@@ -2767,6 +2770,9 @@ s390_return_value (struct gdbarch *gdbar - case RETURN_VALUE_STRUCT_CONVENTION: - error ("Function return value unknown."); + error (_("Function return value unknown.")); break; + + default: @@ -4855,39 +224,28 @@ } } ---- gdb-6.3/gdb/remote.c.fix 2005-03-17 16:52:24.000000000 -0500 -+++ gdb-6.3/gdb/remote.c 2005-03-21 11:53:02.000000000 -0500 -@@ -1,7 +1,7 @@ - /* Remote target communications for serial-line targets in custom GDB protocol - - Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, -- 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -+ 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This file is part of GDB. -@@ -2648,9 +2648,9 @@ cleanup_sigint_signal_handler (void *dum +Index: gdb-6.5/gdb/remote.c +=================================================================== +--- gdb-6.5.orig/gdb/remote.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/remote.c 2006-07-11 02:49:02.000000000 -0300 +@@ -2523,10 +2523,10 @@ cleanup_sigint_signal_handler (void *dum { signal (SIGINT, handle_sigint); if (sigint_remote_twice_token) -- delete_async_signal_handler ((struct async_signal_handler **) & sigint_remote_twice_token); -+ delete_async_signal_handler ((struct async_signal_handler **)(char *) & sigint_remote_twice_token); +- delete_async_signal_handler ((struct async_signal_handler **) ++ delete_async_signal_handler ((struct async_signal_handler **) (char *) + &sigint_remote_twice_token); if (sigint_remote_token) -- delete_async_signal_handler ((struct async_signal_handler **) & sigint_remote_token); -+ delete_async_signal_handler ((struct async_signal_handler **)(char *) & sigint_remote_token); +- delete_async_signal_handler ((struct async_signal_handler **) ++ delete_async_signal_handler ((struct async_signal_handler **) (char *) + &sigint_remote_token); } - /* Send ^C to target to halt it. Target will respond, and send us a ---- gdb-6.3/gdb/f-exp.y.fix 2005-03-17 18:06:56.000000000 -0500 -+++ gdb-6.3/gdb/f-exp.y 2005-03-21 11:52:07.000000000 -0500 -@@ -1,5 +1,5 @@ - /* YACC parser for Fortran expressions, for GDB. -- Copyright 1986, 1989, 1990, 1991, 1993, 1994, 1995, 1996, 2000, 2001 -+ Copyright 1986, 1989, 1990, 1991, 1993, 1994, 1995, 1996, 2000, 2001, 2005 - Free Software Foundation, Inc. - - Contributed by Motorola. Adapted from the C parser by Farooq Butt -@@ -538,6 +538,8 @@ ptype : typebase +Index: gdb-6.5/gdb/f-exp.y +=================================================================== +--- gdb-6.5.orig/gdb/f-exp.y 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/f-exp.y 2006-07-11 02:47:24.000000000 -0300 +@@ -567,6 +567,8 @@ ptype : typebase case tp_function: follow_type = lookup_function_type (follow_type); break; @@ -4896,17 +254,11 @@ } $$ = follow_type; } ---- gdb-6.3/gdb/remote-fileio.c.fix 2005-03-17 16:59:07.000000000 -0500 -+++ gdb-6.3/gdb/remote-fileio.c 2005-03-21 11:53:10.000000000 -0500 -@@ -1,6 +1,6 @@ - /* Remote File-I/O communications - -- Copyright 2003 Free Software Foundation, Inc. -+ Copyright 2003, 2005 Free Software Foundation, Inc. - - This file is part of GDB. - -@@ -1279,19 +1279,19 @@ static struct { +Index: gdb-6.5/gdb/remote-fileio.c +=================================================================== +--- gdb-6.5.orig/gdb/remote-fileio.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/remote-fileio.c 2006-07-11 02:47:24.000000000 -0300 +@@ -1317,19 +1317,19 @@ static struct { char *name; void (*func)(char *); } remote_fio_func_map[] = { @@ -4939,35 +291,20 @@ }; static int ---- gdb-6.3/gdb/source.c.fix 2005-03-17 18:17:50.000000000 -0500 -+++ gdb-6.3/gdb/source.c 2005-03-21 11:53:22.000000000 -0500 -@@ -1,6 +1,6 @@ - /* List lines of source files for GDB, the GNU debugger. - Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, -- 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -+ 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This file is part of GDB. -@@ -147,7 +147,7 @@ get_lines_to_list (void) - struct symtab_and_line - get_current_source_symtab_and_line (void) +Index: gdb-6.5/gdb/source.c +=================================================================== +--- gdb-6.5.orig/gdb/source.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/source.c 2006-07-11 02:47:24.000000000 -0300 +@@ -160,7 +160,7 @@ get_current_source_symtab_and_line (void + void + set_default_source_symtab_and_line (void) { - struct symtab_and_line cursal; + struct symtab_and_line cursal = {0}; - cursal.symtab = current_source_symtab; - cursal.line = current_source_line; -@@ -186,7 +186,7 @@ set_default_source_symtab_and_line (void - struct symtab_and_line - set_current_source_symtab_and_line (const struct symtab_and_line *sal) - { -- struct symtab_and_line cursal; -+ struct symtab_and_line cursal = {0}; - - cursal.symtab = current_source_symtab; - cursal.line = current_source_line; -@@ -1304,7 +1304,7 @@ static void + if (!have_full_symbols () && !have_partial_symbols ()) + error (_("No symbol table is loaded. Use the \"file\" command.")); +@@ -1314,7 +1314,7 @@ static void line_info (char *arg, int from_tty) { struct symtabs_and_lines sals; @@ -4976,18 +313,11 @@ CORE_ADDR start_pc, end_pc; int i; ---- gdb-6.3/gdb/symfile.c.fix 2005-03-17 18:36:52.000000000 -0500 -+++ gdb-6.3/gdb/symfile.c 2005-03-21 11:53:49.000000000 -0500 -@@ -1,7 +1,7 @@ - /* Generic symbol file reading for the GNU debugger, GDB. - - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -- 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+ 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - - Contributed by Cygnus Support, using pieces from other GDB modules. - -@@ -2688,6 +2688,8 @@ add_psymbol_with_dem_name_to_list (char +Index: gdb-6.5/gdb/symfile.c +=================================================================== +--- gdb-6.5.orig/gdb/symfile.c 2006-07-11 02:47:11.000000000 -0300 ++++ gdb-6.5/gdb/symfile.c 2006-07-11 02:52:26.000000000 -0300 +@@ -2877,6 +2877,8 @@ add_psymbol_with_dem_name_to_list (char deprecated_bcache (buf, dem_namelength + 1, objfile->psymbol_cache); break; /* FIXME What should be done for the default case? Ignoring for now. */ @@ -4996,17 +326,11 @@ } /* val and coreaddr are mutually exclusive, one of them *will* be zero */ ---- gdb-6.3/gdb/linespec.c.fix 2005-03-17 19:06:14.000000000 -0500 -+++ gdb-6.3/gdb/linespec.c 2005-03-21 11:52:28.000000000 -0500 -@@ -1,6 +1,6 @@ - /* Parser for linespec for the GNU debugger, GDB. - Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, -- 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -+ 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This file is part of GDB. -@@ -1629,7 +1629,7 @@ static struct symtabs_and_lines +Index: gdb-6.5/gdb/linespec.c +=================================================================== +--- gdb-6.5.orig/gdb/linespec.c 2006-07-11 02:47:12.000000000 -0300 ++++ gdb-6.5/gdb/linespec.c 2006-07-11 02:47:24.000000000 -0300 +@@ -1631,7 +1631,7 @@ static struct symtabs_and_lines find_method (int funfirstline, char ***canonical, char *saved_arg, char *copy, struct type *t, struct symbol *sym_class) { @@ -5015,33 +339,10 @@ struct symbol *sym = 0; int i1; /* Counter for the symbol array. */ struct symbol **sym_arr = alloca (total_number_of_methods (t) ---- gdb-6.3/gdb/macroexp.c.fix 2005-03-17 19:14:37.000000000 -0500 -+++ gdb-6.3/gdb/macroexp.c 2005-03-21 11:52:37.000000000 -0500 -@@ -1,5 +1,5 @@ - /* C preprocessor macro expansion for GDB. -- Copyright 2002 Free Software Foundation, Inc. -+ Copyright 2002, 2005 Free Software Foundation, Inc. - Contributed by Red Hat, Inc. - - This file is part of GDB. -@@ -927,7 +927,7 @@ expand (const char *id, - else if (def->kind == macro_function_like) - { - struct cleanup *back_to = make_cleanup (null_cleanup, 0); -- int argc; -+ int argc = 0; - struct macro_buffer *argv = NULL; - struct macro_buffer substituted; - struct macro_buffer substituted_src; ---- gdb-6.3/gdb/macroscope.c.fix 2005-03-17 19:15:28.000000000 -0500 -+++ gdb-6.3/gdb/macroscope.c 2005-03-21 11:52:46.000000000 -0500 -@@ -1,5 +1,5 @@ - /* Functions for deciding which macros are currently in scope. -- Copyright 2002 Free Software Foundation, Inc. -+ Copyright 2002, 2005 Free Software Foundation, Inc. - Contributed by Red Hat, Inc. - - This file is part of GDB. +Index: gdb-6.5/gdb/macroscope.c +=================================================================== +--- gdb-6.5.orig/gdb/macroscope.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/macroscope.c 2006-07-11 02:47:24.000000000 -0300 @@ -33,7 +33,7 @@ struct macro_scope * sal_macro_scope (struct symtab_and_line sal) @@ -5079,9 +380,11 @@ struct macro_scope *ms; /* If there's a selected frame, use its PC. */ ---- gdb-6.3/gdb/target.c.fix 2005-03-17 19:18:18.000000000 -0500 -+++ gdb-6.3/gdb/target.c 2005-03-17 19:18:58.000000000 -0500 -@@ -1137,6 +1137,9 @@ target_xfer_memory (CORE_ADDR memaddr, c +Index: gdb-6.5/gdb/target.c +=================================================================== +--- gdb-6.5.orig/gdb/target.c 2006-07-11 02:47:12.000000000 -0300 ++++ gdb-6.5/gdb/target.c 2006-07-11 02:52:25.000000000 -0300 +@@ -1142,6 +1142,9 @@ target_xfer_memory (CORE_ADDR memaddr, g if (!write) return EIO; break; @@ -5091,7 +394,7 @@ } while (reg_len > 0) -@@ -1214,6 +1217,9 @@ target_xfer_memory_partial (CORE_ADDR me +@@ -1220,6 +1223,9 @@ target_xfer_memory_partial (CORE_ADDR me return -1; } break; @@ -5101,17 +404,11 @@ } if (region->attrib.cache) ---- gdb-6.3/gdb/gdb-events.c.fix 2005-03-17 19:19:14.000000000 -0500 -+++ gdb-6.3/gdb/gdb-events.c 2005-03-21 11:52:18.000000000 -0500 -@@ -1,6 +1,6 @@ - /* User Interface Events. - -- Copyright 1999, 2001, 2002, 2004 Free Software Foundation, Inc. -+ Copyright 1999, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. - - Contributed by Cygnus Solutions. - -@@ -312,6 +312,8 @@ gdb_events_deliver (struct gdb_events *v +Index: gdb-6.5/gdb/gdb-events.c +=================================================================== +--- gdb-6.5.orig/gdb/gdb-events.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/gdb-events.c 2006-07-11 02:47:24.000000000 -0300 +@@ -321,6 +321,8 @@ gdb_events_deliver (struct gdb_events *v case architecture_changed: vector->architecture_changed (); break; @@ -5120,9 +417,11 @@ } delivering_events = event->next; xfree (event); ---- gdb-6.3/gdb/dwarf2read.c.fix 2005-03-17 19:20:05.000000000 -0500 -+++ gdb-6.3/gdb/dwarf2read.c 2005-03-17 19:24:29.000000000 -0500 -@@ -9052,6 +9052,7 @@ dwarf_decode_macros (struct line_header +Index: gdb-6.5/gdb/dwarf2read.c +=================================================================== +--- gdb-6.5.orig/gdb/dwarf2read.c 2006-07-11 02:47:12.000000000 -0300 ++++ gdb-6.5/gdb/dwarf2read.c 2006-07-11 02:52:25.000000000 -0300 +@@ -9179,6 +9179,7 @@ dwarf_decode_macros (struct line_header for (;;) { enum dwarf_macinfo_record_type macinfo_type; @@ -5130,7 +429,7 @@ /* Do we at least have room for a macinfo type byte? */ if (mac_ptr >= mac_end) -@@ -9063,13 +9064,16 @@ dwarf_decode_macros (struct line_header +@@ -9190,13 +9191,16 @@ dwarf_decode_macros (struct line_header macinfo_type = read_1_byte (abfd, mac_ptr); mac_ptr++; @@ -5141,7 +440,7 @@ + tmp = (int)macinfo_type; + if (tmp == 0) + return; -+ ++ switch (macinfo_type) { - /* A zero macinfo type indicates the end of the macro @@ -5152,19 +451,10 @@ case DW_MACINFO_define: case DW_MACINFO_undef: { ---- gdb-6.3/gdb/stabsread.c.fix 2005-03-17 19:24:48.000000000 -0500 -+++ gdb-6.3/gdb/stabsread.c 2005-03-21 11:53:40.000000000 -0500 -@@ -1,8 +1,8 @@ - /* Support routines for decoding "stabs" debugging information format. - - Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, -- 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free -- Software Foundation, Inc. -+ 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+ Free Software Foundation, Inc. - - This file is part of GDB. - +Index: gdb-6.5/gdb/stabsread.c +=================================================================== +--- gdb-6.5.orig/gdb/stabsread.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/stabsread.c 2006-07-11 02:47:24.000000000 -0300 @@ -1794,7 +1794,8 @@ again: struct type *domain = read_type (pp, objfile); struct type *return_type; @@ -5175,16 +465,11 @@ if (**pp != ',') /* Invalid member type data format. */ ---- gdb-6.3/gdb/dwarf2expr.c.fix 2005-03-17 19:25:46.000000000 -0500 -+++ gdb-6.3/gdb/dwarf2expr.c 2005-03-21 11:51:42.000000000 -0500 -@@ -1,5 +1,5 @@ - /* Dwarf2 Expression Evaluator -- Copyright 2001, 2002, 2003 Free Software Foundation, Inc. -+ Copyright 2001, 2002, 2003, 2005 Free Software Foundation, Inc. - Contributed by Daniel Berlin (dan@dberlin.org) - - This file is part of GDB. -@@ -560,6 +560,8 @@ execute_stack_op (struct dwarf_expr_cont +Index: gdb-6.5/gdb/dwarf2expr.c +=================================================================== +--- gdb-6.5.orig/gdb/dwarf2expr.c 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/dwarf2expr.c 2006-07-11 02:47:24.000000000 -0300 +@@ -559,6 +559,8 @@ execute_stack_op (struct dwarf_expr_cont op_ptr = read_uleb128 (op_ptr, op_end, ®); result += reg; break; @@ -5193,54 +478,11 @@ } break; ---- gdb-6.3/gdb/dwarf2-frame.c.fix 2005-03-17 19:27:00.000000000 -0500 -+++ gdb-6.3/gdb/dwarf2-frame.c 2005-03-21 16:50:11.000000000 -0500 -@@ -1,6 +1,6 @@ - /* Frame unwinder for frames with DWARF Call Frame Information. - -- Copyright 2003, 2004 Free Software Foundation, Inc. -+ Copyright 2003, 2004, 2005 Free Software Foundation, Inc. - - Contributed by Mark Kettenis. - -@@ -1368,7 +1368,8 @@ decode_frame_entry_1 (struct comp_unit * - else if (*augmentation == 'P') - { - /* Skip. */ -- buf += size_of_encoded_value (*buf++); -+ buf += size_of_encoded_value (*buf); -+ ++buf; - augmentation++; - } - ---- gdb-6.3/gdb/ada-lang.h.fix 2005-03-17 19:34:31.000000000 -0500 -+++ gdb-6.3/gdb/ada-lang.h 2005-03-21 11:51:19.000000000 -0500 -@@ -1,5 +1,5 @@ - /* Ada language support definitions for GDB, the GNU debugger. -- Copyright 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -+ Copyright 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. - - This file is part of GDB. -@@ -171,7 +171,7 @@ extern struct task_entry *task_list; - least M objects, updating V and S as necessary. */ - - #define GROW_VECT(v, s, m) \ -- if ((s) < (m)) grow_vect ((void**) &(v), &(s), (m), sizeof(*(v))); -+ if ((s) < (m)) grow_vect ((void**)(char *) &(v), &(s), (m), sizeof(*(v))); - - extern void grow_vect (void **, size_t *, size_t, int); - ---- gdb-6.3/gdb/varobj.c.fix 2005-03-17 19:35:38.000000000 -0500 -+++ gdb-6.3/gdb/varobj.c 2005-03-22 16:29:10.000000000 -0500 -@@ -1,5 +1,5 @@ - /* Implementation of the GDB variable objects API. -- Copyright 1999, 2000, 2001 Free Software Foundation, Inc. -+ Copyright 1999, 2000, 2001, 2005 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -315,10 +315,9 @@ struct language_specific +Index: gdb-6.5/gdb/varobj.c +=================================================================== +--- gdb-6.5.orig/gdb/varobj.c 2006-07-11 02:47:21.000000000 -0300 ++++ gdb-6.5/gdb/varobj.c 2006-07-11 02:47:24.000000000 -0300 +@@ -325,10 +325,9 @@ struct language_specific /* Array of known source language routines. */ static struct language_specific @@ -5253,7 +495,7 @@ c_number_of_children, c_name_of_variable, c_name_of_child, -@@ -329,8 +328,7 @@ static struct language_specific +@@ -339,8 +338,7 @@ static struct language_specific c_value_of_variable} , /* C */ @@ -5263,7 +505,7 @@ c_number_of_children, c_name_of_variable, c_name_of_child, -@@ -341,8 +339,7 @@ static struct language_specific +@@ -351,8 +349,7 @@ static struct language_specific c_value_of_variable} , /* C++ */ @@ -5273,7 +515,7 @@ cplus_number_of_children, cplus_name_of_variable, cplus_name_of_child, -@@ -353,8 +350,7 @@ static struct language_specific +@@ -363,8 +360,7 @@ static struct language_specific cplus_value_of_variable} , /* Java */ @@ -5283,7 +525,7 @@ java_number_of_children, java_name_of_variable, java_name_of_child, -@@ -509,7 +505,7 @@ varobj_create (char *objname, +@@ -519,7 +515,7 @@ varobj_create (char *objname, /* Set language info */ lang = variable_language (var); @@ -5292,22 +534,41 @@ /* Set ourselves as our root */ var->root->rootvar = var; ---- gdb-6.3/gdb/configure.in.fix 2005-03-21 17:59:50.000000000 -0500 -+++ gdb-6.3/gdb/configure.in 2005-03-21 18:00:42.000000000 -0500 -@@ -1,5 +1,5 @@ - dnl Autoconf configure script for GDB, the GNU debugger. --dnl Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -+dnl Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 - dnl Free Software Foundation, Inc. - dnl - dnl This file is part of GDB. -@@ -1132,7 +1132,8 @@ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) +Index: gdb-6.5/gdb/configure.ac +=================================================================== +--- gdb-6.5.orig/gdb/configure.ac 2006-07-11 02:46:52.000000000 -0300 ++++ gdb-6.5/gdb/configure.ac 2006-07-11 02:47:24.000000000 -0300 +@@ -1133,7 +1133,8 @@ fi # gdb/doc/gdbint.texinfo. build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \ - -Wformat -Wparentheses -Wpointer-arith -Wuninitialized -Wformat-nonliteral \ ---Wunused-label -Wunused-function" + -Wformat -Wparentheses -Wpointer-arith -Wformat-nonliteral \ +--Wunused-label -Wunused-function -Wno-pointer-sign" +-Wunused-label -Wunused-function -Wno-pointer-sign -Wno-unused \ +-Wp,-U_FORTIFY_SOURCE" - # Up for debate: -Wswitch -Wcomment -trigraphs -Wtrigraphs - # -Wunused-function -Wunused-variable -Wunused-value - # -Wchar-subscripts -Wtraditional -Wshadow -Wcast-qual + + # GCC supports -Wuninitialized only with -O or -On, n != 0. + if test x${CFLAGS+set} = xset; then +Index: gdb-6.5/gdb/doublest.c +=================================================================== +--- gdb-6.5.orig/gdb/doublest.c 2005-12-17 20:33:59.000000000 -0200 ++++ gdb-6.5/gdb/doublest.c 2006-07-11 02:55:55.000000000 -0300 +@@ -94,15 +94,10 @@ get_field (const bfd_byte *data, enum fl + { + result |= (unsigned long)*(data + cur_byte) << cur_bitshift; + cur_bitshift += FLOATFORMAT_CHAR_BIT; +- switch (order) +- { +- case floatformat_little: +- ++cur_byte; +- break; +- case floatformat_big: +- --cur_byte; +- break; +- } ++ if (order == floatformat_little) ++ ++cur_byte; ++ else ++ --cur_byte; + } + if (len < sizeof(result) * FLOATFORMAT_CHAR_BIT) + /* Mask out bits which are not part of the field */ diff --git a/gdb.spec b/gdb.spec index 8c32c13..b10f3d8 100644 --- a/gdb.spec +++ b/gdb.spec @@ -8,19 +8,19 @@ Name: gdb # Set version to contents of gdb/version.in. # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch). -Version: 6.3.0.0 +Version: 6.5 # The release always contains a leading reserved number, start it at 0. -Release: 1.132.FC6 +Release: 1%{?dist} License: GPL Group: Development/Debuggers -Source: ftp://ftp.gnu.org/gnu/gdb/gdb-6.3.tar.bz2 +Source: ftp://ftp.gnu.org/gnu/gdb/gdb-6.5.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-root URL: http://gnu.org/software/gdb/ # For our convenience -%define gdb_src gdb-6.3 +%define gdb_src gdb-6.5 %define gdb_build %{gdb_src}/build-%{_target_platform} # Make sure we get rid of the old package gdb64, now that we have unified @@ -56,14 +56,6 @@ Patch4: gdb-6.3-rh-testlibunwind1fix-20041202.patch # frames are identified as signal frames. Patch101: gdb-6.3-sigx86-20040621.patch -# Don't reject signal trampoline frames that have a [data] symbol -# associated with them as occures when backtracing through an -# alt-stack in the data address space. -Patch102: gdb-6.3-sigsymtramp-20040621.patch - -# Add unwinders for PPC and PPC64 signal trampolines. -Patch103: gdb-6.3-ppcsignals-20040621.patch - # Use convert_from_func_ptr_addr on the solib breakpoint address; # simplifies and makes more consistent the logic. Patch104: gdb-6.3-ppcdotsolib-20041022.patch @@ -74,23 +66,10 @@ Patch105: gdb-6.3-ppc64syscall-20040622.patch # Stop a backtrace when a zero PC is encountered. Patch106: gdb-6.3-framepczero-20040927.patch -# Hack around broken header files that incorrectly define the FPSCR -# macro. -Patch107: gdb-6.3-ppc64fpscrhack-20041026.patch - # Pass the pc's section into the symbol search code; stops the lookup # finding a symbol from the wrong section. Patch108: gdb-6.3-ppc64section-20041026.patch -# Add PPC register groups so that info registers et.al.; along with -# register save and restore; work better. On PPC-64 it was restoring -# the PS register setting the break-on-branch bit! -Patch109: gdb-6.3-ppcreggroups-20041124.patch - -# Fix up 64-bit PPC inferior function calls so that function -# parameters are passed correctly. -Patch110: gdb-6.3-ppc64abi-20040621.patch - # Include the pc's section when doing a symbol lookup so that the # correct symbol is found. Patch111: gdb-6.3-ppc64displaysymbol-20041124.patch @@ -101,9 +80,6 @@ Patch112: gdb-6.3-thread-step-20041207.patch # Threaded watchpoint support Patch113: gdb-6.3-threaded-watchpoints-20041213.patch -# Multiple patches to ia64 backtrace -Patch114: gdb-6.3-ia64-backtrace-20041213.patch - # Fix to expose multiple constructors to end-user Patch115: gdb-6.3-constructor-20041216.patch @@ -123,46 +99,28 @@ Patch119: gdb-6.3-lwp-cache-20041216.patch # Fix to ensure types are visible Patch120: gdb-6.3-type-fix-20041213.patch -# Fix for allowing macros to continue after backtrace errors -Patch121: gdb-6.3-backtrace-20041216.patch - # VSYSCALL and PIE Patch122: gdb-6.3-test-pie-20050107.patch -Patch123: gdb-6.3-vsyscall-20041216.patch Patch124: gdb-6.3-pie-20050110.patch # Get selftest working with sep-debug-info Patch125: gdb-6.3-test-self-20050110.patch -# No longer a need to set .malloc on ppc64. -Patch126: gdb-6.3-ppcmalloc-20041124.patch - # Enable PPC CFI support. Patch127: gdb-6.3-ppccfi-20041104.patch # Fix for non-threaded watchpoints. Patch128: gdb-6.3-nonthreaded-wp-20050117.patch -# Add synthetic symbols (esp PPC-64 .symbols) to min symtab -Patch129: gdb-6.3-ppcdotsym-20050126.patch - # Add PPC .symbols to min-symtable. Patch130: gdb-6.3-ctorline-20050120.patch -# Handle nested, and back-to-back signals when stepping. -Patch131: gdb-6.3-sigrepeats-20050121.patch -Patch132: gdb-6.3-test-sigrepeats-20050121.patch - # Fix to support multiple destructors just like multiple constructors Patch133: gdb-6.3-test-dtorfix-20050121.patch Patch134: gdb-6.3-dtorfix-20050121.patch -# Fix for ia64 to prevent SIGSEGV in debugger -Patch135: gdb-6.3-ia64fix-20050121.patch - # Fix to support executable moving Patch136: gdb-6.3-test-movedir-20050125.patch -Patch137: gdb-6.3-movedir-20050125.patch # Fix to support unwinding syscalls in ia64 corefiles Patch138: gdb-6.3-ia64-corefile-fix-20050127.patch @@ -179,18 +137,9 @@ Patch141: gdb-6.3-step-thread-exit-20050211.patch # Prevent gdb from being pushed into background Patch142: gdb-6.3-terminal-fix-20050214.patch -# Fix for unload.exp testcase -Patch143: gdb-6.3-unload-test-20050216.patch - -# Backport addition symfile-mem.o to all GNU/Linux systems. -Patch144: gdb-6.3-addsymfilemem-20050209.patch - # Allow sibling threads to set threaded watchpoints for x86 and x86-64 Patch145: gdb-6.3-threaded-watchpoints2-20050225.patch -# Follow vfork fix from mainline sources -Patch146: gdb-6.3-follow-vfork-20050303.patch - # Fix unexpected compiler warning messages. Patch147: gdb-6.3-warnings-20050317.patch @@ -204,22 +153,10 @@ Patch149: gdb-6.3-ia64-vsyscall-20050330.patch Patch150: gdb-6.3-test-sepcrc-20050402.patch Patch151: gdb-6.3-sepcrc-20050402.patch -# Handle read side of DW_OP_piece. -Patch152: gdb-6.3-dwoppieceread-20050407.patch - # Do not issue warning message about first page of storage for ia64 gcore Patch153: gdb-6.3-ia64-gcore-page0-20050421.patch -# Ia64 patch for added libunwind support -Patch154: gdb-6.3-ia64-sigtramp-20050427.patch - -# Partial die in cache fix -Patch155: gdb-6.3-partial-die-20050503.patch - -# SA_RESTART patch -Patch156: gdb-6.3-sarestart-20050518.patch - -# Security errata for bfd overflow and untrusted .gdbinit +# Security errata for untrusted .gdbinit Patch157: gdb-6.3-security-errata-20050610.patch # IA64 sigtramp prev register patch @@ -249,9 +186,6 @@ Patch165: gdb-6.3-xfree-20050922.patch # Fix frame pointer for ia64 sigtramp frame Patch166: gdb-6.3-ia64-sigtramp-fp-20050926.patch -# Fix DSO read logic for attached process -Patch167: gdb-6.3-attach-dso-20050929.patch - # Support gdb attaching to a stopped process Patch168: gdb-6.3-attach-stop-20051011.patch @@ -261,23 +195,12 @@ Patch169: gdb-6.3-ia64-sigill-20051115.patch # Allow option to continue backtracing past a zero pc value Patch170: gdb-6.3-bt-past-zero-20051201.patch -# Silence type-punning warnings that cause compilation errors because -# of -Werror. -Patch171: gdb-6.3-type-punning-20060214.patch - -# Enable gdb to debug using executables and core files with different -# prelink base addresses. -Patch172: gdb-6.3-prelink-core-20060223.patch - # Enable gdb to recognize stack frames annotated with the "S" augmentation. Patch173: gdb-6.3-augmS-20060303.patch # Enable gdb to recognize CFA value expressions introduced in Dwarf3. Patch174: gdb-6.3-cfaval-20060303.patch -# Use fopen64 where available. -Patch175: gdb-6.3-support-fopen64-20060413.patch - # Use bigger numbers than int. Patch176: gdb-6.3-large-core-20051206.patch @@ -323,61 +246,40 @@ and printing their data. %patch4 -p1 %patch101 -p1 -%patch102 -p1 -%patch103 -p1 %patch104 -p1 %patch105 -p1 %patch106 -p1 -%patch107 -p1 %patch108 -p1 -%patch109 -p1 -%patch110 -p1 %patch111 -p1 %patch112 -p1 %patch113 -p1 -%patch114 -p1 %patch115 -p1 %patch116 -p1 %patch117 -p1 %patch118 -p1 %patch119 -p1 %patch120 -p1 -%patch121 -p1 %patch122 -p1 -%patch123 -p1 %patch124 -p1 %patch125 -p1 -%patch126 -p1 %patch127 -p1 %patch128 -p1 -%patch129 -p1 %patch130 -p1 -%patch131 -p1 -%patch132 -p1 %patch133 -p1 %patch134 -p1 -%patch135 -p1 %patch136 -p1 -%patch137 -p1 %patch138 -p1 %patch139 -p1 %patch140 -p1 %patch141 -p1 %patch142 -p1 -%patch143 -p1 -%patch144 -p1 %patch145 -p1 -%patch146 -p1 %patch147 -p1 %patch148 -p1 %patch149 -p1 %patch150 -p1 %patch151 -p1 -%patch152 -p1 %patch153 -p1 -%patch154 -p1 -%patch155 -p1 -%patch156 -p1 %patch157 -p1 %patch158 -p1 %patch159 -p1 @@ -388,15 +290,11 @@ and printing their data. %patch164 -p1 %patch165 -p1 %patch166 -p1 -%patch167 -p1 %patch168 -p1 %patch169 -p1 %patch170 -p1 -%patch171 -p1 -%patch172 -p1 %patch173 -p1 %patch174 -p1 -%patch175 -p1 %patch176 -p1 %patch177 -p1 %patch178 -p1 @@ -569,6 +467,10 @@ fi # don't include the files in include, they are part of binutils %changelog +* Tue Jul 11 2006 Alexandre Oliva - 6.5-1 +- Upgrade to GDB 6.5. Drop redundant patches, forward-port remaining +ones. + * Thu Jun 15 2006 Alexandre Oliva - 6.3.0.0-1.132 - Require flex and bison at build time. - Additional patch for BZ 175083, to cope with waitpid setting status diff --git a/sources b/sources index f112a78..0946ff9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05b928f41fa5b482e49ca2c24762a0ae gdb-6.3.tar.bz2 +af6c8335230d7604aee0803b1df14f54 gdb-6.5.tar.bz2