public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
From: jkratoch@sourceware.org
To: archer-commits@sourceware.org
Subject: [SCM] archer-jankratochvil-ifunc: Merge remote branch 'origin/master' into archer-jankratochvil-ifunc
Date: Thu, 21 Jan 2010 01:02:00 -0000 [thread overview]
Message-ID: <20100121010218.23240.qmail@sourceware.org> (raw)
The branch, archer-jankratochvil-ifunc has been updated
via 0f7e38dc2606612ecb326c1c31f52e355b8eee77 (commit)
via 9dc87bd7cc7c2974d470472ea29215d7cb13fb47 (commit)
via 1f3ff38c22ae7fb1dfc11dab847c123da2c68b1e (commit)
via 52768469875240e2608a701ad7d97187eec0168b (commit)
via d0e93734a089a8f1a78134675b59a385c8780305 (commit)
via ce7767d47b00c53b90cd9a56a68d5713592985ea (commit)
via 4f6fe059caecec9e688a2b27fce29a427fd7de9c (commit)
via efca436ee3ce532149a7e568149edf93a75a9a5e (commit)
via e9d6247f3e0c88822735be45843c7d44d8d9d2b8 (commit)
via 47cf631cfac84796d765b828dc0f0a0f9e5f8421 (commit)
via 9662e0d8e12b61ce48a4e6db0253a74c10e300a3 (commit)
via 2222f182712cef65fe3cef0aacee02db78a535b5 (commit)
via 4b66564260abfa85a019a530fcc70a47ee84d756 (commit)
via 21c261bf9817bad398e3a9dc4f689fc77c29fe42 (commit)
via 0e8b3876e99d71abd763d00994d48fad5c7227c6 (commit)
via d075bfd0bd6524d67773a431e1763be1aa0e2ace (commit)
via 4904bca4648dc794b7a973def465ea86ecf55e45 (commit)
from 99f7e0fb89f6cd81d6342da0bcc905f296c30003 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 0f7e38dc2606612ecb326c1c31f52e355b8eee77
Merge: 9dc87bd7cc7c2974d470472ea29215d7cb13fb47 1f3ff38c22ae7fb1dfc11dab847c123da2c68b1e
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date: Thu Jan 21 02:01:33 2010 +0100
Merge remote branch 'origin/master' into archer-jankratochvil-ifunc
commit 9dc87bd7cc7c2974d470472ea29215d7cb13fb47
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date: Thu Jan 21 02:00:29 2010 +0100
fix
-----------------------------------------------------------------------
Summary of changes:
bfd/ChangeLog | 4 +
bfd/dwarf2.c | 4 +
bfd/version.h | 2 +-
gdb/ChangeLog | 74 +++++
gdb/ada-lang.c | 25 +--
gdb/alpha-linux-tdep.c | 4 +
gdb/amd64-linux-tdep.c | 3 +
gdb/arm-linux-tdep.c | 3 +
gdb/dwarf2expr.c | 28 ++-
gdb/dwarf2read.c | 2 +-
gdb/frv-linux-tdep.c | 21 ++-
gdb/frv-tdep.c | 2 +-
gdb/frv-tdep.h | 3 +
gdb/gdbserver/ChangeLog | 7 +
gdb/gdbserver/linux-low.c | 10 +-
gdb/gdbtypes.c | 4 +-
gdb/gdbtypes.h | 4 +-
gdb/hppa-linux-tdep.c | 21 ++-
gdb/hppa-tdep.c | 2 +-
gdb/hppa-tdep.h | 4 +
gdb/i386-linux-tdep.c | 3 +
gdb/ia64-linux-tdep.c | 4 +
gdb/infcall.c | 21 --
gdb/infcmd.c | 161 ++++++-----
gdb/inferior.c | 7 +
gdb/inferior.h | 25 ++-
gdb/linespec.c | 17 --
gdb/linux-tdep.c | 39 +++
gdb/linux-tdep.h | 7 +
gdb/m32r-linux-tdep.c | 4 +
gdb/main.c | 101 ++++----
gdb/mi/mi-cmd-env.c | 17 +-
gdb/microblaze-linux-tdep.c | 4 +
gdb/mips-linux-tdep.c | 4 +
gdb/mn10300-linux-tdep.c | 4 +
gdb/ppc-linux-tdep.c | 16 +-
gdb/sh-linux-tdep.c | 4 +
gdb/solib.c | 6 +-
gdb/sparc-linux-tdep.c | 4 +
gdb/sparc64-linux-tdep.c | 4 +
gdb/testsuite/ChangeLog | 23 ++
gdb/testsuite/gdb.base/gnu-ifunc-lib.c | 15 +-
gdb/testsuite/gdb.dwarf2/Makefile.in | 2 +-
gdb/testsuite/gdb.dwarf2/pr10770.c | 335 ++++++++++++++++++++++
gdb/testsuite/gdb.dwarf2/pr10770.exp | 44 +++
gdb/testsuite/gdb.mi/mi-async.exp | 9 +-
gdb/testsuite/gdb.threads/watchthreads-reorder.c | 41 ++--
gdb/valarith.c | 28 ++
gdb/varobj.c | 18 +-
gdb/version.in | 2 +-
gdb/xtensa-linux-tdep.c | 4 +
opcodes/ChangeLog | 6 +
opcodes/arm-dis.c | 6 +-
sim/m32c/ChangeLog | 5 +
sim/m32c/m32c.opc | 2 +-
55 files changed, 965 insertions(+), 254 deletions(-)
create mode 100644 gdb/testsuite/gdb.dwarf2/pr10770.c
create mode 100644 gdb/testsuite/gdb.dwarf2/pr10770.exp
First 500 lines of diff:
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3f68528..75574a7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-19 Cary Coutant <ccoutant@google.com>
+
+ * dwarf2.c (read_attribute_value): Add DW_FORM_ref_sig8.
+
2010-01-19 Daisuke Hatayama <d.hatayama@jp.fujitsu.com>
Alan Modra <amodra@gmail.com>
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index baac752..89d9f4b 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -858,6 +858,10 @@ read_attribute_value (struct attribute *attr,
attr->u.val = read_8_bytes (abfd, info_ptr);
info_ptr += 8;
break;
+ case DW_FORM_ref_sig8:
+ attr->u.val = read_8_bytes (abfd, info_ptr);
+ info_ptr += 8;
+ break;
case DW_FORM_ref_udata:
attr->u.val = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
info_ptr += bytes_read;
diff --git a/bfd/version.h b/bfd/version.h
index e5d5def..478944e 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20100119
+#define BFD_VERSION_DATE 20100120
#define BFD_VERSION @bfd_version@
#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@
#define REPORT_BUGS_TO @report_bugs_to@
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 07ed4d2..ca5f9d4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,77 @@
+2010-01-20 Tom Tromey <tromey@redhat.com>
+
+ PR backtrace/10770:
+ * valarith.c (value_binop): Handle BINOP_GTR, BINOP_LEQ, and
+ BINOP_GEQ. Handle BINOP_NOTEQUAL in the signed case.
+ * dwarf2expr.c (new_dwarf_expr_context): Allocate
+ dwarf_stack_values, not CORE_ADDRs.
+ (execute_stack_op): Change DW_OP_div and comparison operators to
+ use signed operands.
+
+2010-01-20 Vladimir Prus <vladimir@codesourcery.com>
+
+ Per-inferior args and tty and environment.
+
+ * infcmd.c (inferior_args): Rename to ...
+ (inferior_args_scratch): ... this.
+ (inferior_io_terminal): Rename to ...
+ (inferior_io_terminal_scratch): ... this.
+ (inferior_argc, inferior_argv): Remove.
+ (set_inferior_io_terminal, get_inferior_io_terminal): Store
+ inside current_inferior().
+ (set_inferior_tty_command, show_inferior_tty_command): New.
+ (get_inferior_args, set_inferior_args): Store inside
+ current_inferior().
+ (notice_args_set): Likewise and rename to...
+ (set_args_command): ... this.
+ (set_inferior_args_vector): Likewise.
+ (notice_args_read): Rename to...
+ (show_args_command): ...new.
+ (tty_command): Remove.
+ (run_command_1): Don't free old args, as they are freed by
+ set_inferior_arg now.
+ (run_no_args_command): Likewise.
+ (inferior_environ): Remove.
+ (run_command_1): Use environment of the current inferior.
+ (environment_info, set_environment_command)
+ (unset_environment_command, path_info, path_command): Likewise.
+ (_initialize_infcmd): Adjust for function and variable renames.
+ Do not init inferior_environ.
+ * inferior.h (set_inferior_arg): Adjust prototype.
+ (struct inferior): New fields args, argc, argv, terminal, environment.
+ (inferior_environ): Remove declaration.
+ * inferior.c (free_inferior): Free new fields.
+ (add_inferior_silent): Initialize 'environment' field.
+ * main.c (captured_main): Set arguments only after the initial
+ inferior has been created. Set set_inferior_io_terminal,
+ not tty_command.
+ * mi/mi-main.c (mi_cmd_env_path): Use environment of the current
+ inferior.
+ (_initialize_mi_cmd_env): Adjust for disappearance of global
+ inferior_environ.
+ * solib.c (solib_find): Use environment of the current inferior.
+
+2010-01-20 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * varobj.c (varobj_add_child, install_dynamic_child): Wrap into #if
+ HAVE_PYTHON.
+ (instantiate_pretty_printer): Move HAVE_PYTHON outside of the function.
+
+2010-01-20 Joel Brobecker <brobecker@adacore.com>
+
+ Get rid of ada-lang.c:function_name_from_pc.
+ * ada-lang.c: Add "stack.h" #include.
+ (function_name_from_pc): Delete.
+ (is_known_support_routine): Replace call to function_name_from_pc
+ by call to find_frame_funname.
+ (ada_unhandled_exception_name_addr_from_raise): Likewise.
+
+2010-01-19 Tom Tromey <tromey@redhat.com>
+
+ PR c++/11026:
+ * dwarf2read.c (read_partial_die): Allocate partial DIE's name on
+ objfile obstack.
+
2010-01-19 Tom Tromey <tromey@redhat.com>
* top.c (stop_sig, float_handler, do_nothing): Remove.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index f00c06f..40b70ab 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -56,6 +56,7 @@
#include "source.h"
#include "observer.h"
#include "vec.h"
+#include "stack.h"
/* Define whether or not the C operator '/' truncates towards zero for
differently signed operands (truncation direction is undefined in C).
@@ -10150,21 +10151,6 @@ ada_executable_changed_observer (void)
exception_info = NULL;
}
-/* Return the name of the function at PC, NULL if could not find it.
- This function only checks the debugging information, not the symbol
- table. */
-
-static char *
-function_name_from_pc (CORE_ADDR pc)
-{
- char *func_name;
-
- if (!find_pc_partial_function (pc, &func_name, NULL, NULL))
- return NULL;
-
- return func_name;
-}
-
/* True iff FRAME is very likely to be that of a function that is
part of the runtime system. This is all very heuristic, but is
intended to be used as advice as to what frames are uninteresting
@@ -10175,6 +10161,7 @@ is_known_support_routine (struct frame_info *frame)
{
struct symtab_and_line sal;
char *func_name;
+ enum language func_lang;
int i;
/* If this code does not have any debugging information (no symtab),
@@ -10210,7 +10197,7 @@ is_known_support_routine (struct frame_info *frame)
/* Check whether the function is a GNAT-generated entity. */
- func_name = function_name_from_pc (get_frame_address_in_block (frame));
+ find_frame_funname (frame, &func_name, &func_lang);
if (func_name == NULL)
return 1;
@@ -10275,8 +10262,10 @@ ada_unhandled_exception_name_addr_from_raise (void)
while (fi != NULL)
{
- const char *func_name =
- function_name_from_pc (get_frame_address_in_block (fi));
+ char *func_name;
+ enum language func_lang;
+
+ find_frame_funname (fi, &func_name, &func_lang);
if (func_name != NULL
&& strcmp (func_name, exception_info->catch_exception_sym) == 0)
break; /* We found the frame we were looking for... */
diff --git a/gdb/alpha-linux-tdep.c b/gdb/alpha-linux-tdep.c
index 3c71f2f..bbfe5a1 100644
--- a/gdb/alpha-linux-tdep.c
+++ b/gdb/alpha-linux-tdep.c
@@ -26,6 +26,7 @@
#include "symtab.h"
#include "regset.h"
#include "regcache.h"
+#include "linux-tdep.h"
#include "alpha-tdep.h"
@@ -236,6 +237,9 @@ alpha_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
set_gdbarch_regset_from_core_section
(gdbarch, alpha_linux_regset_from_core_section);
+
+ set_gdbarch_convert_from_func_ptr_addr (gdbarch,
+ linux_convert_from_func_ptr_addr);
}
/* Provide a prototype to silence -Wmissing-prototypes. */
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index 01cc1ce..2a0fa84 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -1481,6 +1481,9 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
amd64_linux_record_tdep.arg6 = AMD64_R9_REGNUM;
tdep->i386_syscall_record = amd64_linux_syscall_record;
+
+ set_gdbarch_convert_from_func_ptr_addr (gdbarch,
+ linux_convert_from_func_ptr_addr);
}
\f
diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index 661a5bd..dc91ab1 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -907,6 +907,9 @@ arm_linux_init_abi (struct gdbarch_info info,
set_gdbarch_displaced_step_free_closure (gdbarch,
simple_displaced_step_free_closure);
set_gdbarch_displaced_step_location (gdbarch, displaced_step_at_entry_point);
+
+ set_gdbarch_convert_from_func_ptr_addr (gdbarch,
+ linux_convert_from_func_ptr_addr);
}
/* Provide a prototype to silence -Wmissing-prototypes. */
diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c
index 5e27d38..ed21edf 100644
--- a/gdb/dwarf2expr.c
+++ b/gdb/dwarf2expr.c
@@ -44,7 +44,8 @@ new_dwarf_expr_context (void)
retval = xcalloc (1, sizeof (struct dwarf_expr_context));
retval->stack_len = 0;
retval->stack_allocated = 10;
- retval->stack = xmalloc (retval->stack_allocated * sizeof (CORE_ADDR));
+ retval->stack = xmalloc (retval->stack_allocated
+ * sizeof (struct dwarf_stack_value));
retval->num_pieces = 0;
retval->pieces = 0;
retval->max_recursion_depth = 0x100;
@@ -712,7 +713,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
the right width. */
CORE_ADDR first, second;
enum exp_opcode binop;
- struct value *val1, *val2;
+ struct value *val1 = NULL, *val2 = NULL;
struct type *stype, *utype;
second = dwarf_expr_fetch (ctx, 0);
@@ -723,8 +724,6 @@ execute_stack_op (struct dwarf_expr_context *ctx,
utype = unsigned_address_type (ctx->gdbarch, ctx->addr_size);
stype = signed_address_type (ctx->gdbarch, ctx->addr_size);
- val1 = value_from_longest (utype, first);
- val2 = value_from_longest (utype, second);
switch (op)
{
@@ -733,6 +732,8 @@ execute_stack_op (struct dwarf_expr_context *ctx,
break;
case DW_OP_div:
binop = BINOP_DIV;
+ val1 = value_from_longest (stype, first);
+ val2 = value_from_longest (stype, second);
break;
case DW_OP_minus:
binop = BINOP_SUB;
@@ -764,26 +765,45 @@ execute_stack_op (struct dwarf_expr_context *ctx,
break;
case DW_OP_le:
binop = BINOP_LEQ;
+ val1 = value_from_longest (stype, first);
+ val2 = value_from_longest (stype, second);
break;
case DW_OP_ge:
binop = BINOP_GEQ;
+ val1 = value_from_longest (stype, first);
+ val2 = value_from_longest (stype, second);
break;
case DW_OP_eq:
binop = BINOP_EQUAL;
+ val1 = value_from_longest (stype, first);
+ val2 = value_from_longest (stype, second);
break;
case DW_OP_lt:
binop = BINOP_LESS;
+ val1 = value_from_longest (stype, first);
+ val2 = value_from_longest (stype, second);
break;
case DW_OP_gt:
binop = BINOP_GTR;
+ val1 = value_from_longest (stype, first);
+ val2 = value_from_longest (stype, second);
break;
case DW_OP_ne:
binop = BINOP_NOTEQUAL;
+ val1 = value_from_longest (stype, first);
+ val2 = value_from_longest (stype, second);
break;
default:
internal_error (__FILE__, __LINE__,
_("Can't be reached."));
}
+
+ /* We use unsigned operands by default. */
+ if (val1 == NULL)
+ val1 = value_from_longest (utype, first);
+ if (val2 == NULL)
+ val2 = value_from_longest (utype, second);
+
result = value_as_long (value_binop (val1, val2, binop));
}
break;
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index db51653..15ef3e9 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -6781,7 +6781,7 @@ read_partial_die (struct partial_die_info *part_die,
default:
part_die->name
= dwarf2_canonicalize_name (DW_STRING (&attr), cu,
- &cu->comp_unit_obstack);
+ &cu->objfile->objfile_obstack);
break;
}
break;
diff --git a/gdb/frv-linux-tdep.c b/gdb/frv-linux-tdep.c
index c051a4d..5b07063 100644
--- a/gdb/frv-linux-tdep.c
+++ b/gdb/frv-linux-tdep.c
@@ -32,6 +32,7 @@
#include "frame-unwind.h"
#include "regset.h"
#include "gdb_string.h"
+#include "linux-tdep.h"
/* Define the size (in bytes) of an FR-V instruction. */
static const int frv_instr_size = 4;
@@ -486,7 +487,21 @@ frv_linux_regset_from_core_section (struct gdbarch *gdbarch,
return NULL;
}
-\f
+static CORE_ADDR
+frv_linux_convert_from_func_ptr_addr (struct gdbarch *gdbarch,
+ CORE_ADDR addr,
+ struct target_ops *targ)
+{
+ CORE_ADDR pc = frv_convert_from_func_ptr_addr (gdbarch, addr, targ);
+ CORE_ADDR resolved;
+
+ resolved = linux_convert_from_func_and_ptr (gdbarch, addr, pc);
+ if (resolved != pc)
+ pc = frv_convert_from_func_ptr_addr (gdbarch, resolved, targ);
+
+ return pc;
+}
+
static void
frv_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
@@ -494,6 +509,10 @@ frv_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
frame_unwind_append_unwinder (gdbarch, &frv_linux_sigtramp_frame_unwind);
set_gdbarch_regset_from_core_section (gdbarch,
frv_linux_regset_from_core_section);
+
+ if (frv_abi (gdbarch) == FRV_ABI_FDPIC)
+ set_gdbarch_convert_from_func_ptr_addr (gdbarch,
+ frv_linux_convert_from_func_ptr_addr);
}
static enum gdb_osabi
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index a38ec8e..b8856a9 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -1169,7 +1169,7 @@ find_func_descr (struct gdbarch *gdbarch, CORE_ADDR entry_point)
return descr;
}
-static CORE_ADDR
+CORE_ADDR
frv_convert_from_func_ptr_addr (struct gdbarch *gdbarch, CORE_ADDR addr,
struct target_ops *targ)
{
diff --git a/gdb/frv-tdep.h b/gdb/frv-tdep.h
index 25cc9c4..95d5fe5 100644
--- a/gdb/frv-tdep.h
+++ b/gdb/frv-tdep.h
@@ -118,3 +118,6 @@ CORE_ADDR frv_fetch_objfile_link_map (struct objfile *objfile);
struct target_so_ops;
extern struct target_so_ops frv_so_ops;
+CORE_ADDR frv_convert_from_func_ptr_addr (struct gdbarch *gdbarch,
+ CORE_ADDR addr,
+ struct target_ops *targ);
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index f947937..2113f51 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-20 Doug Evans <dje@google.com>
+
+ * linux-low.c (linux_create_inferior): Wrap use of __SIGRTMIN in
+ #ifdef.
+ (linux_wait_for_event1, linux_init_signals): Ditto.
+ (W_STOPCODE): Provide definition if missing.
+
2010-01-13 Vladimir Prus <vladimir@codesourcery.com>
* linux-low.c (linux_core_of_thread): New.
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 5584691..4869db3 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -93,6 +93,10 @@
#define __WALL 0x40000000 /* Wait for any child. */
#endif
+#ifndef W_STOPCODE
+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
+#endif
+
#ifdef __UCLIBC__
#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
#define HAS_NOMMU
@@ -498,7 +502,9 @@ linux_create_inferior (char *program, char **allargs)
{
ptrace (PTRACE_TRACEME, 0, 0, 0);
+#ifdef __SIGRTMIN /* Bionic doesn't use SIGRTMIN the way glibc does. */
signal (__SIGRTMIN + 1, SIG_DFL);
+#endif
setpgid (0, 0);
@@ -1209,7 +1215,7 @@ linux_wait_for_event_1 (ptid_t ptid, int *wstat, int options)
if (WIFSTOPPED (*wstat)
&& !event_child->stepping
&& (
-#ifdef USE_THREAD_DB
+#if defined (USE_THREAD_DB) && defined (__SIGRTMIN)
(current_process ()->private->thread_db != NULL
&& (WSTOPSIG (*wstat) == __SIGRTMIN
|| WSTOPSIG (*wstat) == __SIGRTMIN + 1))
@@ -3410,7 +3416,9 @@ linux_init_signals ()
{
/* FIXME drow/2002-06-09: As above, we should check with LinuxThreads
to find what the cancel signal actually is. */
+#ifdef __SIGRTMIN /* Bionic doesn't use SIGRTMIN the way glibc does. */
signal (__SIGRTMIN+1, SIG_IGN);
+#endif
}
void
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index a8bb072..29bccf4 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3471,8 +3471,8 @@ gdbtypes_post_init (struct gdbarch *gdbarch)
= lookup_pointer_type (builtin_type->builtin_void);
builtin_type->builtin_func_ptr
= lookup_pointer_type (lookup_function_type (builtin_type->builtin_void));
- builtin_type->builtin_func_func_ptr
- = lookup_pointer_type (lookup_function_type (builtin_type->builtin_func_ptr));
+ builtin_type->builtin_func_func
+ = lookup_function_type (builtin_type->builtin_func_ptr);
/* This type represents a GDB internal function. */
builtin_type->internal_fn
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 411b5e0..0ba7a08 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1149,9 +1149,9 @@ struct builtin_type
(*) () can server as a generic function pointer. */
struct type *builtin_func_ptr;
- /* `pointer to function returning pointer to function (returning void)' type.
+ /* `function returning pointer to function (returning void)' type.
The final void return type is not significant for it. */
- struct type *builtin_func_func_ptr;
+ struct type *builtin_func_func;
/* Special-purpose types. */
diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c
index ebfc2f5..e40105b 100644
--- a/gdb/hppa-linux-tdep.c
+++ b/gdb/hppa-linux-tdep.c
@@ -32,6 +32,7 @@
#include "regset.h"
#include "regcache.h"
hooks/post-receive
--
Repository for Project Archer.
next reply other threads:[~2010-01-21 1:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-21 1:02 jkratoch [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-01-17 14:12 jkratoch
2011-01-07 7:32 jkratoch
2010-11-16 6:02 jkratoch
2010-10-15 17:11 jkratoch
2010-10-14 20:58 jkratoch
2010-10-13 15:10 jkratoch
2010-10-11 9:30 jkratoch
2010-04-04 12:12 jkratoch
2010-02-26 17:59 jkratoch
2010-02-13 23:11 jkratoch
2010-02-03 4:56 jkratoch
2010-01-28 11:49 jkratoch
2010-01-20 0:13 jkratoch
2009-12-06 17:45 jkratoch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100121010218.23240.qmail@sourceware.org \
--to=jkratoch@sourceware.org \
--cc=archer-commits@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).