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 c38af40e9ff0b180cc71b970239634ed974ca183..ce876b89dc67ad27fef4ff140a4964554a9e9e09 100644 (file)
--- 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 6d0079707507a35ff73e782c39ff39b66992e5ff..b0f6303c907d62366962657e3aca4da85afb1cf3 100644 (file)
--- 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                                                          ---*/