From: Paul Brook <paul@codesourcery.com>
Date: Wed, 8 Mar 2006 14:23:31 +0000 (+0000)
Subject: 2006-03-08  Paul Brook  <paul@codesourcery.com>
X-Git-Tag: gdb-csl-20060226-branch-merge-to-csl-local-1~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92fc7457dcccc67a30bc17a90f590b3ba54e06ee;p=thirdparty%2Fbinutils-gdb.git

2006-03-08  Paul Brook  <paul@codesourcery.com>

	Backport from mainline.
	* gdb/arm-tdep.c (arm_push_dummy_call): Remove stack alignment.
	(arm_frame_align): New function.
	(arm_gdbarch_init): Use it.
---

diff --git a/ChangeLog.csl b/ChangeLog.csl
index caf863b80c5..0ce4f4ccfbb 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+2006-03-08  Paul Brook  <paul@codesourcery.com>
+
+	Backport from mainline.
+	* gdb/arm-tdep.c (arm_push_dummy_call): Remove stack alignment.
+	(arm_frame_align): New function.
+	(arm_gdbarch_init): Use it.
+
 2006-03-07  Paul Brook  <paul@codesourcery.com>
 
 	Backport from mainline.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 652be4b7234..cb3c2615910 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -1173,11 +1173,6 @@ arm_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
   argreg = ARM_A1_REGNUM;
   nstack = 0;
 
-  /* Some platforms require a double-word aligned stack.  Make sure sp
-     is correctly aligned before we start.  We always do this even if
-     it isn't really needed -- it can never hurt things.  */
-  sp &= ~(CORE_ADDR)(2 * DEPRECATED_REGISTER_SIZE - 1);
-
   /* The struct_return pointer occupies the first parameter
      passing register.  */
   if (struct_return)
@@ -1299,6 +1294,17 @@ arm_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
   return sp;
 }
 
+
+/* Always align the frame to an 8-byte boundary.  This is required on
+   some platforms and harmless on the rest.  */
+
+static CORE_ADDR
+arm_frame_align (struct gdbarch *gdbarch, CORE_ADDR sp)
+{
+  /* Align the stack to eight bytes.  */
+  return sp & ~ (CORE_ADDR) 7;
+}
+
 static void
 print_fpu_flags (int flags)
 {
@@ -2738,6 +2744,7 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   tdep->jb_pc = -1;	/* Longjump support not enabled by default.  */
 
   set_gdbarch_push_dummy_call (gdbarch, arm_push_dummy_call);
+  set_gdbarch_frame_align (gdbarch, arm_frame_align);
 
   set_gdbarch_write_pc (gdbarch, arm_write_pc);