From: Nicholas Nethercote <njn@valgrind.org>
Date: Wed, 20 May 2009 02:27:00 +0000 (+0000)
Subject: DARWIN sync: put conditional compilation alternatives in the usual order.
X-Git-Tag: svn/VALGRIND_3_5_0~652
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ed160c72cc4044c9ae7d173093a3fb0ba4811ed;p=thirdparty%2Fvalgrind.git

DARWIN sync: put conditional compilation alternatives in the usual order.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10003
---

diff --git a/coregrind/m_debuginfo/d3basics.c b/coregrind/m_debuginfo/d3basics.c
index 8969cdc365..f561c4cd50 100644
--- a/coregrind/m_debuginfo/d3basics.c
+++ b/coregrind/m_debuginfo/d3basics.c
@@ -379,12 +379,12 @@ static Long read_leb128S( UChar **data )
 static Bool get_Dwarf_Reg( /*OUT*/Addr* a, Word regno, RegSummary* regs )
 {
    vg_assert(regs);
-#  if defined(VGP_amd64_linux)
-   if (regno == 6/*RBP*/) { *a = regs->fp; return True; }
-   if (regno == 7/*RSP*/) { *a = regs->sp; return True; }
-#  elif defined(VGP_x86_linux)
+#  if defined(VGP_x86_linux)
    if (regno == 5/*EBP*/) { *a = regs->fp; return True; }
    if (regno == 4/*ESP*/) { *a = regs->sp; return True; }
+#  elif defined(VGP_amd64_linux)
+   if (regno == 6/*RBP*/) { *a = regs->fp; return True; }
+   if (regno == 7/*RSP*/) { *a = regs->sp; return True; }
 #  elif defined(VGP_ppc32_linux)
    if (regno == 1/*SP*/) { *a = regs->sp; return True; }
    if (regno == 31) return False;