* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 86300ac4b6a43790ceb3c76dd52a14b6de71190c..e34ba3057089bf2cc7e4e30191f786ed63d7015d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+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.
+       
 2001-09-26  Andrew Cagney  <ac131313@redhat.com>
 
        From 2001-07-09 D.J. Barrow <djbarrow@de.ibm.com>:

diff --git a/gdb/config/s390/s390.mt b/gdb/config/s390/s390.mt
index d1dfe9f82c25832556d73b0146bde886a117319d..87a5ba349c54c244bba99f22533012804c466ad4 100644 (file)
--- a/gdb/config/s390/s390.mt
+++ b/gdb/config/s390/s390.mt
@@ -3,5 +3,5 @@ TM_FILE= tm-linux.h
 TDEPFILES=s390-tdep.o solib.o
 # Post 5.0 tdep-files
 TDEPFILES+=solib-svr4.o solib-legacy.o
-GDB_MULTI_ARCH=2
+GDB_MULTI_ARCH=GDB_MULTI_ARCH_PARTIAL
 GDBSERVER_DEPFILES= low-linux.o s390-tdep.o s390-nat.o

diff --git a/gdb/config/s390/s390x.mt b/gdb/config/s390/s390x.mt
index 632fa5271de64576848527936950cf05e48a529c..310021dda50931ec8fb2a37092683f7569f9407a 100644 (file)
--- a/gdb/config/s390/s390x.mt
+++ b/gdb/config/s390/s390x.mt
@@ -3,7 +3,7 @@ TM_FILE= tm-linux.h
 TDEPFILES=s390-tdep.o solib.o
 # Post 5.0 tdep-files
 TDEPFILES+=solib-svr4.o solib-legacy.o
-GDB_MULTI_ARCH=2
+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

diff --git a/gdb/config/s390/tm-linux.h b/gdb/config/s390/tm-linux.h
index bb1e58728cedf8f37d4bbbda01b251192271ac68..e70b117c3910496712d535476832fc45a9c5c309 100644 (file)
--- a/gdb/config/s390/tm-linux.h
+++ b/gdb/config/s390/tm-linux.h
@@ -29,6 +29,12 @@
 #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"
 
 

diff --git a/gdb/config/tm-sysv4.h b/gdb/config/tm-sysv4.h
index 1ed6bc3c1396d56c5de0943ca855bd612adb5c58..35b95eb71f8927285ca3233e6af4a36d7ff24ef2 100644 (file)
--- a/gdb/config/tm-sysv4.h
+++ b/gdb/config/tm-sysv4.h
@@ -33,9 +33,9 @@ extern int in_plt_section (CORE_ADDR, char *);
 
 /* 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