From: Florian Krohm <florian@eich-krohm.de>
Date: Wed, 17 Dec 2014 13:18:51 +0000 (+0000)
Subject: Join two #ifdefs, eliminating one.
X-Git-Tag: svn/VALGRIND_3_11_0~767
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5734a854d5c9806455ba5a7380a97d963fbc9304;p=thirdparty%2Fvalgrind.git

Join two #ifdefs, eliminating one.


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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 3f14452539..4e9f696abc 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -2666,9 +2666,6 @@ void shutdown_actions_NORETURN( ThreadId tid,
 static void final_tidyup(ThreadId tid)
 {
 #if !defined(VGO_darwin)
-#  if defined(VGP_ppc64be_linux)
-   Addr r2;
-#  endif
    Addr __libc_freeres_wrapper = VG_(client___libc_freeres_wrapper);
 
    vg_assert(VG_(is_running_thread)(tid));
@@ -2679,7 +2676,7 @@ static void final_tidyup(ThreadId tid)
       return;			/* can't/won't do it */
 
 #  if defined(VGP_ppc64be_linux)
-   r2 = VG_(get_tocptr)( __libc_freeres_wrapper );
+   Addr r2 = VG_(get_tocptr)( __libc_freeres_wrapper );
    if (r2 == 0) {
       VG_(message)(Vg_UserMsg, 
                    "Caught __NR_exit, but can't run __libc_freeres()\n");