From: Julian Seward <jseward@acm.org>
Date: Tue, 12 Jul 2011 07:27:23 +0000 (+0000)
Subject: Disable stabs reading on Android; it's uncompilable, and there's no
X-Git-Tag: svn/VALGRIND_3_7_0~354
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00977fac18903efb71bf97dff88863fbf5b13d7b;p=thirdparty%2Fvalgrind.git

Disable stabs reading on Android; it's uncompilable, and there's no
point.


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

diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
index c38af40e9f..ce876b89dc 100644
--- a/coregrind/m_debuginfo/readelf.c
+++ b/coregrind/m_debuginfo/readelf.c
@@ -865,6 +865,7 @@ static
 Char *find_buildid(Addr image, UWord n_image)
 {
    Char* buildid = NULL;
+   __attribute__((unused)) /* on Android, at least */
    ElfXX_Ehdr* ehdr = (ElfXX_Ehdr*)image;
 
 #ifdef NT_GNU_BUILD_ID
@@ -2322,9 +2323,11 @@ Bool ML_(read_elf_debug_info) ( struct _DebugInfo* di )
          we ignore it.  On s390x stabs also doesnt work and we always
          have the dwarf info in the eh_frame.  We also segfault on
          ppc64-linux when reading stabs, so skip that.  ppc32-linux
-         seems OK though. */
-#     if !defined(VGP_amd64_linux) && !defined(VGP_s390x_linux) \
-         && !defined(VGP_ppc64_linux)
+         seems OK though.  Also skip on Android. */
+#     if !defined(VGP_amd64_linux) \
+         && !defined(VGP_s390x_linux) \
+         && !defined(VGP_ppc64_linux) \
+         && !defined(VGPV_arm_linux_android)
       if (stab_img && stabstr_img) {
          ML_(read_debuginfo_stabs) ( di, stab_img, stab_sz, 
                                          stabstr_img, stabstr_sz );
diff --git a/coregrind/m_debuginfo/readstabs.c b/coregrind/m_debuginfo/readstabs.c
index 6d00797075..b0f6303c90 100644
--- a/coregrind/m_debuginfo/readstabs.c
+++ b/coregrind/m_debuginfo/readstabs.c
@@ -28,14 +28,16 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#if defined(VGO_linux) || defined(VGO_darwin)
-
 /*
    Stabs reader greatly improved by Nick Nethercote, Apr 02.
    This module was also extensively hacked on by Jeremy Fitzhardinge
    and Tom Hughes.
 */
 
+/* "on Linux (except android), or on Darwin" */
+#if (defined(VGO_linux) && !defined(VGPV_arm_linux_android)) \
+    || defined(VGO_darwin)
+
 #include "pub_core_basics.h"
 #include "pub_core_debuginfo.h"
 #include "pub_core_libcbase.h"
@@ -386,7 +388,8 @@ void ML_(read_debuginfo_stabs) ( DebugInfo* di,
    }
 }
 
-#endif // defined(VGO_linux) || defined(VGO_darwin)
+#endif /* (defined(VGO_linux) && !defined(VGPV_arm_linux_android)) \
+          || defined(VGO_darwin) */
 
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/