* arch-utils.c (legacy_pc_in_sigtramp): Move preprocessor expression

	for IN_SIGTRAMP to here.  Use IN_SIGTRAMP only if it's defined.
	Guard usage of SIGTRAMP_START() by using SIGTRAMP_START_P.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f077dc2b8df22e88aaa51b5fe035ae754d5e6d50..0252b338686f10475f90703b3fcd0048dc919cbe 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-14  Corinna Vinschen  <vinschen@redhat.com>
+
+       * arch-utils.c (legacy_pc_in_sigtramp): Move preprocessor expression
+       for IN_SIGTRAMP to here.  Use IN_SIGTRAMP only if it's defined. 
+       Guard usage of SIGTRAMP_START() by using SIGTRAMP_START_P.
+
 2002-09-13  Christopher Faylor  <cgf@redhat.com>
 
        * win32-nat.c (child_create_inferior): Honor 'tty' command.

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index ecdecaf9a1a2bd46b2c84ca310d830106bc161a4..3666bd55c0673d873b4228b9c2f780799b2b1212 100644 (file)
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -438,18 +438,6 @@ generic_register_size (int regnum)
   return TYPE_LENGTH (REGISTER_VIRTUAL_TYPE (regnum));
 }
 
-#if !defined (IN_SIGTRAMP)
-#if defined (SIGTRAMP_START)
-#define IN_SIGTRAMP(pc, name) \
-       ((pc) >= SIGTRAMP_START(pc)   \
-        && (pc) < SIGTRAMP_END(pc) \
-        )
-#else
-#define IN_SIGTRAMP(pc, name) \
-       (name && STREQ ("_sigtramp", name))
-#endif
-#endif
-
 /* Assume all registers are adjacent.  */
 
 int
@@ -470,7 +458,14 @@ generic_register_byte (int regnum)
 int
 legacy_pc_in_sigtramp (CORE_ADDR pc, char *name)
 {
-  return IN_SIGTRAMP(pc, name);
+#if !defined (IN_SIGTRAMP)
+  if (SIGTRAMP_START_P ())
+    return (pc) >= SIGTRAMP_START (pc) && (pc) < SIGTRAMP_END (pc);
+  else
+    return name && strcmp ("_sigtramp", name) == 0;
+#else
+  return IN_SIGTRAMP (pc, name);
+#endif
 }
 
 int