This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[rfc] [4/8] Remove macro FETCH_TLS_LOAD_MODULE_ADDRESS and FETCH_TLS_LOAD_MODULE_ADDRESS_P
- From: Markus Deuling <deuling at de dot ibm dot com>
- To: GDB Patches <gdb-patches at sourceware dot org>
- Cc: Ulrich Weigand <uweigand at de dot ibm dot com>
- Date: Fri, 08 Jun 2007 11:11:32 +0200
- Subject: [rfc] [4/8] Remove macro FETCH_TLS_LOAD_MODULE_ADDRESS and FETCH_TLS_LOAD_MODULE_ADDRESS_P
Hello,
this patch removes FETCH_TLS_LOAD_MODULE_ADDRESS and FETCH_TLS_LOAD_MODULE_ADDRESS_P macros from gdbarch.sh
ChangeLog:
* 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.
Is this ok to commit?
--
Markus Deuling
GNU Toolchain for Linux on Cell BE
deuling@de.ibm.com
diff -urN src/gdb/gdbarch.c dev/gdb/gdbarch.c
--- src/gdb/gdbarch.c 2007-05-14 17:16:57.000000000 +0200
+++ dev/gdb/gdbarch.c 2007-05-24 06:17:08.000000000 +0200
@@ -999,21 +999,9 @@
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 -urN src/gdb/gdbarch.h dev/gdb/gdbarch.h
--- src/gdb/gdbarch.h 2007-05-14 17:16:57.000000000 +0200
+++ dev/gdb/gdbarch.h 2007-05-24 06:16:58.000000000 +0200
@@ -866,30 +866,11 @@
/* 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 -urN src/gdb/gdbarch.sh dev/gdb/gdbarch.sh
--- src/gdb/gdbarch.sh 2007-05-14 17:16:57.000000000 +0200
+++ dev/gdb/gdbarch.sh 2007-05-24 06:16:52.000000000 +0200
@@ -564,7 +564,7 @@
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