From: Julian Seward <jseward@acm.org>
Date: Thu, 28 Apr 2016 15:52:01 +0000 (+0000)
Subject: Un-break ppc32-linux following r15784.  It appears that ppc32-ELF
X-Git-Tag: svn/VALGRIND_3_12_0~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=325dfcc0d97657017226378cbe2327a3556c1f80;p=thirdparty%2Fvalgrind.git

Un-break ppc32-linux following r15784.  It appears that ppc32-ELF
layout constraints are different from x86-ELF and so the assertion on
the sizeof(TTEntryC) fails on ppc32-linux.


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

diff --git a/coregrind/m_transtab.c b/coregrind/m_transtab.c
index 75debaf4ef..3651381b64 100644
--- a/coregrind/m_transtab.c
+++ b/coregrind/m_transtab.c
@@ -2448,10 +2448,18 @@ void VG_(init_tt_tc) ( void )
    if (sizeof(HWord) == 8) {
       vg_assert(sizeof(TTEntryH) <= 32);
       vg_assert(sizeof(TTEntryC) <= 112);
-   } else if (sizeof(HWord) == 4) {
+   } 
+   else if (sizeof(HWord) == 4) {
       vg_assert(sizeof(TTEntryH) <= 20);
+#     if defined(VGP_ppc32_linux)
+      /* ppc32-linux is weird.  It thinks alignof(ULong) == 8 and so the
+         structure is larger than on other 32 bit targets. */
+      vg_assert(sizeof(TTEntryC) <= 96);
+#     else
       vg_assert(sizeof(TTEntryC) <= 88);
-   } else {
+#     endif
+   }
+   else {
       vg_assert(0);
    }