Fix a bunch of defined(VGA_ppc64)

(a.o. this was making leak_cpp_interior test failing,
as the ppc64 specific code in mc_leakcheck.c was not compiled in)

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

diff --git a/exp-sgcheck/pc_main.c b/exp-sgcheck/pc_main.c
index 41632fa7d61c458a504374150eaf440f1afe0c1f..50dd402329d223b5436d5baa8084c76edf57f55f 100644 (file)
--- a/exp-sgcheck/pc_main.c
+++ b/exp-sgcheck/pc_main.c
@@ -65,7 +65,7 @@ static void pc_pre_clo_init(void)
    VG_(printf)("SGCheck doesn't work on s390x yet, sorry.\n");
    VG_(exit)(1);
 #endif
-#if defined(VGA_ppc32) || defined(VGA_ppc64)
+#if defined(VGA_ppc32) || defined(VGA_ppc64be) || defined(VGA_ppc64le)
    VG_(printf)("SGCheck doesn't work on PPC yet, sorry.\n");
    VG_(exit)(1);
 #endif

diff --git a/memcheck/mc_leakcheck.c b/memcheck/mc_leakcheck.c
index cb8abd162f215dba31ee0b62ed46868e4583b874..8b624e251e51f9f4efacdcd3233750d08ba1b2c8 100644 (file)
--- a/memcheck/mc_leakcheck.c
+++ b/memcheck/mc_leakcheck.c
@@ -648,7 +648,7 @@ static Bool aligned_ptr_above_page0_is_vtable_addr(Addr ptr)
       if (pot_fn == 0)
          continue; // NULL fn pointer. Seems it can happen in vtable.
       seg = VG_(am_find_nsegment) (pot_fn);
-#if defined(VGA_ppc64)
+#if defined(VGA_ppc64be) || defined(VGA_ppc64le)
       // ppc64 use a thunk table. So, we have one more level of indirection
       // to follow.
       if (seg == NULL

diff --git a/memcheck/mc_machine.c b/memcheck/mc_machine.c
index ff56a6ec68a39d481528f80bd057fbc6048a2096..006990f608690fd387fe53b518a46bd2dc45ecad 100644 (file)
--- a/memcheck/mc_machine.c
+++ b/memcheck/mc_machine.c
@@ -371,7 +371,7 @@ static Int get_otrack_shadow_offset_wrk ( Int offset, Int szB )
    Int  o  = offset;
    Int  sz = szB;
    tl_assert(sz > 0);
-#if defined(VGA_ppc64)
+#if defined(VGA_ppc64be)
    tl_assert(host_is_big_endian());
 #elif defined(VGA_ppc64le)
    tl_assert(host_is_little_endian());