From 985969a94f02c64a2e8ff4b0afd8378ed09fca5e Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sat, 9 Jun 2007 13:59:42 +0000 Subject: [PATCH] 2007-06-09 Markus Deuling * gdbarch.sh (FETCH_TLS_LOAD_MODULE_ADDRESS): Replace by gdbarch_fetch_tls_load_module_address. * gdbarch.sh (FETCH_TLS_LOAD_MODULE_ADDRESS_P): Replace by gdbarch_fetch_tls_load_module_address_p. * gdbarch.c, gdbarch.h: Regenerate. --- gdb/ChangeLog | 8 ++++++++ gdb/gdbarch.c | 12 ------------ gdb/gdbarch.h | 19 ------------------- gdb/gdbarch.sh | 2 +- 4 files changed, 9 insertions(+), 32 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cc1a3a38132..ace7a6523d7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2007-06-09 Markus Deuling + + * gdbarch.sh (FETCH_TLS_LOAD_MODULE_ADDRESS): Replace by + gdbarch_fetch_tls_load_module_address. + * gdbarch.sh (FETCH_TLS_LOAD_MODULE_ADDRESS_P): Replace by + gdbarch_fetch_tls_load_module_address_p. + * gdbarch.c, gdbarch.h: Regenerate. + 2007-06-09 Markus Deuling * gdbarch.sh (DECR_PC_AFTER_BREAK): Replace by diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index f3b894ce001..a935becab7a 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -911,21 +911,9 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: fetch_pointer_argument = <0x%lx>\n", (long) current_gdbarch->fetch_pointer_argument); -#ifdef FETCH_TLS_LOAD_MODULE_ADDRESS_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "FETCH_TLS_LOAD_MODULE_ADDRESS_P()", - XSTRING (FETCH_TLS_LOAD_MODULE_ADDRESS_P ())); -#endif fprintf_unfiltered (file, "gdbarch_dump: gdbarch_fetch_tls_load_module_address_p() = %d\n", gdbarch_fetch_tls_load_module_address_p (current_gdbarch)); -#ifdef FETCH_TLS_LOAD_MODULE_ADDRESS - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "FETCH_TLS_LOAD_MODULE_ADDRESS(objfile)", - XSTRING (FETCH_TLS_LOAD_MODULE_ADDRESS (objfile))); -#endif fprintf_unfiltered (file, "gdbarch_dump: fetch_tls_load_module_address = <0x%lx>\n", (long) current_gdbarch->fetch_tls_load_module_address); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index e195f8a4c63..c1e9d6e0225 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -745,30 +745,11 @@ extern void set_gdbarch_remote_register_number (struct gdbarch *gdbarch, gdbarch /* Fetch the target specific address used to represent a load module. */ -#if defined (FETCH_TLS_LOAD_MODULE_ADDRESS) -/* Legacy for systems yet to multi-arch FETCH_TLS_LOAD_MODULE_ADDRESS */ -#if !defined (FETCH_TLS_LOAD_MODULE_ADDRESS_P) -#define FETCH_TLS_LOAD_MODULE_ADDRESS_P() (1) -#endif -#endif - extern int gdbarch_fetch_tls_load_module_address_p (struct gdbarch *gdbarch); -#if !defined (GDB_TM_FILE) && defined (FETCH_TLS_LOAD_MODULE_ADDRESS_P) -#error "Non multi-arch definition of FETCH_TLS_LOAD_MODULE_ADDRESS" -#endif -#if !defined (FETCH_TLS_LOAD_MODULE_ADDRESS_P) -#define FETCH_TLS_LOAD_MODULE_ADDRESS_P() (gdbarch_fetch_tls_load_module_address_p (current_gdbarch)) -#endif typedef CORE_ADDR (gdbarch_fetch_tls_load_module_address_ftype) (struct objfile *objfile); extern CORE_ADDR gdbarch_fetch_tls_load_module_address (struct gdbarch *gdbarch, struct objfile *objfile); extern void set_gdbarch_fetch_tls_load_module_address (struct gdbarch *gdbarch, gdbarch_fetch_tls_load_module_address_ftype *fetch_tls_load_module_address); -#if !defined (GDB_TM_FILE) && defined (FETCH_TLS_LOAD_MODULE_ADDRESS) -#error "Non multi-arch definition of FETCH_TLS_LOAD_MODULE_ADDRESS" -#endif -#if !defined (FETCH_TLS_LOAD_MODULE_ADDRESS) -#define FETCH_TLS_LOAD_MODULE_ADDRESS(objfile) (gdbarch_fetch_tls_load_module_address (current_gdbarch, objfile)) -#endif extern CORE_ADDR gdbarch_frame_args_skip (struct gdbarch *gdbarch); extern void set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, CORE_ADDR frame_args_skip); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 81cc07d255b..91043ca1cec 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -564,7 +564,7 @@ v:=:CORE_ADDR:deprecated_function_start_offset:::0:::0 m::int:remote_register_number:int regno:regno::default_remote_register_number::0 # Fetch the target specific address used to represent a load module. -F:=:CORE_ADDR:fetch_tls_load_module_address:struct objfile *objfile:objfile +F::CORE_ADDR:fetch_tls_load_module_address:struct objfile *objfile:objfile # v::CORE_ADDR:frame_args_skip:::0:::0 M::CORE_ADDR:unwind_pc:struct frame_info *next_frame:next_frame -- 2.30.2