From: Corinna Vinschen <corinna@vinschen.de>
Date: Sat, 14 Sep 2002 09:40:36 +0000 (+0000)
Subject: 	* arch-utils.c (legacy_pc_in_sigtramp): Move preprocessor expression
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db54fef4278fb8c9e69125e4e98314d23220517f;p=binutils-gdb.git

	* 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 f077dc2b8df..0252b338686 100644
--- 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 ecdecaf9a1a..3666bd55c06 100644
--- 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