Fix compiler warnings on ppc due to unused s390 specific variables.

diff --git a/coregrind/m_debuginfo/debuginfo.c b/coregrind/m_debuginfo/debuginfo.c
index 4ce976a6d4622da5d5909ab97276f0c6306c8e58..63ed32608e0c809ac6c0d8ac43746e4e8cf804e7 100644 (file)
--- a/coregrind/m_debuginfo/debuginfo.c
+++ b/coregrind/m_debuginfo/debuginfo.c
@@ -3554,7 +3554,6 @@ Bool VG_(use_CF_info) ( /*MOD*/D3UnwindRegs* uregsHere,
 #  endif
 
 #  if defined(VGA_s390x)
-   const Bool is_s390x = True;
    const Addr old_S390X_F0 = uregsHere->f0;
    const Addr old_S390X_F1 = uregsHere->f1;
    const Addr old_S390X_F2 = uregsHere->f2;
@@ -3563,16 +3562,9 @@ Bool VG_(use_CF_info) ( /*MOD*/D3UnwindRegs* uregsHere,
    const Addr old_S390X_F5 = uregsHere->f5;
    const Addr old_S390X_F6 = uregsHere->f6;
    const Addr old_S390X_F7 = uregsHere->f7;
+#   define SAVE_TO_PREV(p,reg) do { p = reg; } while (0)
 #  else
-   const Bool is_s390x = False;
-   const Addr old_S390X_F0 = 0;
-   const Addr old_S390X_F1 = 0;
-   const Addr old_S390X_F2 = 0;
-   const Addr old_S390X_F3 = 0;
-   const Addr old_S390X_F4 = 0;
-   const Addr old_S390X_F5 = 0;
-   const Addr old_S390X_F6 = 0;
-   const Addr old_S390X_F7 = 0;
+#   define SAVE_TO_PREV(p,reg) do { vg_assert(0); } while (0)
 #  endif
 
 #  define COMPUTE(_prev, _here, _how, _off)             \
@@ -3604,29 +3596,29 @@ Bool VG_(use_CF_info) ( /*MOD*/D3UnwindRegs* uregsHere,
                if (!ok) return False;                   \
                break;                                   \
             case CFIR_S390X_F0:                               \
-               if (is_s390x) { _prev = old_S390X_F0; break; } \
-               vg_assert(0+0-0);                              \
+               SAVE_TO_PREV(_prev, old_S390X_F0);             \
+               break;                                         \
             case CFIR_S390X_F1:                               \
-               if (is_s390x) { _prev = old_S390X_F1; break; } \
-               vg_assert(0+1-1);                              \
+               SAVE_TO_PREV(_prev, old_S390X_F1);             \
+               break;                                         \
             case CFIR_S390X_F2:                               \
-               if (is_s390x) { _prev = old_S390X_F2; break; } \
-               vg_assert(0+2-2);                              \
+               SAVE_TO_PREV(_prev, old_S390X_F2);             \
+               break;                                         \
             case CFIR_S390X_F3:                               \
-               if (is_s390x) { _prev = old_S390X_F3; break; } \
-               vg_assert(0+3-3);                              \
+               SAVE_TO_PREV(_prev, old_S390X_F3);             \
+               break;                                         \
             case CFIR_S390X_F4:                               \
-               if (is_s390x) { _prev = old_S390X_F4; break; } \
-               vg_assert(0+4-4);                              \
+               SAVE_TO_PREV(_prev, old_S390X_F4);             \
+               break;                                         \
             case CFIR_S390X_F5:                               \
-               if (is_s390x) { _prev = old_S390X_F5; break; } \
-               vg_assert(0+5-5);                              \
+               SAVE_TO_PREV(_prev, old_S390X_F5);             \
+               break;                                         \
             case CFIR_S390X_F6:                               \
-               if (is_s390x) { _prev = old_S390X_F6; break; } \
-               vg_assert(0+6-6);                              \
+               SAVE_TO_PREV(_prev, old_S390X_F6);             \
+               break;                                         \
             case CFIR_S390X_F7:                               \
-               if (is_s390x) { _prev = old_S390X_F7; break; } \
-               vg_assert(0+7-7);                              \
+               SAVE_TO_PREV(_prev, old_S390X_F7);             \
+               break;                                         \
             default:                                    \
                vg_assert(0*0);                          \
          }                                              \