This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[patch/5.1/s390] multi-arch partial and override SKIP_TRAMP.
- To: gdb-patches at sources dot redhat dot com
- Subject: [patch/5.1/s390] multi-arch partial and override SKIP_TRAMP.
- From: Andrew Cagney <ac131313 at cygnus dot com>
- Date: Sat, 13 Oct 2001 13:43:27 -0400
FYI,
I checked this into the s390 branch - one less thing to merge/change in
5.1 and the trunk.
Andrew
2001-10-13 Andrew Cagney <ac131313@redhat.com>
* config/s390/s390x.mt (GDB_MULTI_ARCH): Change to
GDB_MULTI_ARCH_PARTIAL.
* config/s390/s390.mt (GDB_MULTI_ARCH): Ditto.
* config/s390/tm-linux.h (SKIP_TRAMPOLINE_CODE): Undefine
definition from config/tm-linux.h. Allow gdbarch to override it.
* config/tm-sysv4.h: Revert. Handled by tm-linux.h.
Index: config/tm-sysv4.h
===================================================================
RCS file: /cvs/src/src/gdb/config/tm-sysv4.h,v
retrieving revision 1.3.6.1
diff -p -r1.3.6.1 tm-sysv4.h
*** tm-sysv4.h 2001/09/27 00:13:30 1.3.6.1
--- tm-sysv4.h 2001/10/13 17:09:28
*************** extern int in_plt_section (CORE_ADDR, ch
*** 33,41 ****
/* If PC is in a shared library trampoline code, return the PC
where the function itself actually starts. If not, return 0. */
! #if (GDB_MULTI_ARCH <= GDB_MULTI_ARCH_PARTIAL)
#define SKIP_TRAMPOLINE_CODE(pc) find_solib_trampoline_target (pc)
! #endif
/* It is unknown which, if any, SVR4 assemblers do not accept dollar signs
in identifiers. The default in G++ is to use dots instead, for all SVR4
systems, so we make that our default also. FIXME: There should be some
--- 33,41 ----
/* If PC is in a shared library trampoline code, return the PC
where the function itself actually starts. If not, return 0. */
!
#define SKIP_TRAMPOLINE_CODE(pc) find_solib_trampoline_target (pc)
!
/* It is unknown which, if any, SVR4 assemblers do not accept dollar signs
in identifiers. The default in G++ is to use dots instead, for all SVR4
systems, so we make that our default also. FIXME: There should be some
Index: config/s390/s390.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/s390/Attic/s390.mt,v
retrieving revision 1.1.2.1
diff -p -r1.1.2.1 s390.mt
*** s390.mt 2001/09/27 00:13:30 1.1.2.1
--- s390.mt 2001/10/13 17:09:28
*************** TM_FILE= tm-linux.h
*** 3,7 ****
TDEPFILES=s390-tdep.o solib.o
# Post 5.0 tdep-files
TDEPFILES+=solib-svr4.o solib-legacy.o
! GDB_MULTI_ARCH=2
GDBSERVER_DEPFILES= low-linux.o s390-tdep.o s390-nat.o
--- 3,7 ----
TDEPFILES=s390-tdep.o solib.o
# Post 5.0 tdep-files
TDEPFILES+=solib-svr4.o solib-legacy.o
! GDB_MULTI_ARCH=GDB_MULTI_ARCH_PARTIAL
GDBSERVER_DEPFILES= low-linux.o s390-tdep.o s390-nat.o
Index: config/s390/s390x.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/s390/Attic/s390x.mt,v
retrieving revision 1.1.2.1
diff -p -r1.1.2.1 s390x.mt
*** s390x.mt 2001/09/27 00:13:30 1.1.2.1
--- s390x.mt 2001/10/13 17:09:28
*************** TM_FILE= tm-linux.h
*** 3,9 ****
TDEPFILES=s390-tdep.o solib.o
# Post 5.0 tdep-files
TDEPFILES+=solib-svr4.o solib-legacy.o
! GDB_MULTI_ARCH=2
GDBSERVER_DEPFILES= low-linux.o s390-tdep.o s390-nat.o
# needed for gdbserver.
MT_CFLAGS= -DCONFIG_ARCH_S390X
--- 3,9 ----
TDEPFILES=s390-tdep.o solib.o
# Post 5.0 tdep-files
TDEPFILES+=solib-svr4.o solib-legacy.o
! GDB_MULTI_ARCH=GDB_MULTI_ARCH_PARTIAL
GDBSERVER_DEPFILES= low-linux.o s390-tdep.o s390-nat.o
# needed for gdbserver.
MT_CFLAGS= -DCONFIG_ARCH_S390X
Index: config/s390/tm-linux.h
===================================================================
RCS file: /cvs/src/src/gdb/config/s390/Attic/tm-linux.h,v
retrieving revision 1.1.2.1
diff -p -r1.1.2.1 tm-linux.h
*** tm-linux.h 2001/09/27 00:13:30 1.1.2.1
--- tm-linux.h 2001/10/13 17:09:28
***************
*** 29,34 ****
--- 29,40 ----
#define TARGET_ELF64 (gdbarch_tdep (current_gdbarch)->intreg_size==8)
#include "config/tm-linux.h"
+
+ /* Zap several macros defined in the above header so that multi-arch
+ can safely re-define them. The ``correct fix'' involves
+ eliminating either the above include or even this file. */
+ #undef SKIP_TRAMPOLINE_CODE
+
#include "s390/tm-s390.h"