|
From: <sv...@va...> - 2011-07-12 07:32:13
|
Author: sewardj
Date: 2011-07-12 08:27:23 +0100 (Tue, 12 Jul 2011)
New Revision: 11883
Log:
Disable stabs reading on Android; it's uncompilable, and there's no
point.
Modified:
trunk/coregrind/m_debuginfo/readelf.c
trunk/coregrind/m_debuginfo/readstabs.c
Modified: trunk/coregrind/m_debuginfo/readelf.c
===================================================================
--- trunk/coregrind/m_debuginfo/readelf.c 2011-07-12 07:14:47 UTC (rev 11882)
+++ trunk/coregrind/m_debuginfo/readelf.c 2011-07-12 07:27:23 UTC (rev 11883)
@@ -865,6 +865,7 @@
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 @@
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 );
Modified: trunk/coregrind/m_debuginfo/readstabs.c
===================================================================
--- trunk/coregrind/m_debuginfo/readstabs.c 2011-07-12 07:14:47 UTC (rev 11882)
+++ trunk/coregrind/m_debuginfo/readstabs.c 2011-07-12 07:27:23 UTC (rev 11883)
@@ -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 @@
}
}
-#endif // defined(VGO_linux) || defined(VGO_darwin)
+#endif /* (defined(VGO_linux) && !defined(VGPV_arm_linux_android)) \
+ || defined(VGO_darwin) */
/*--------------------------------------------------------------------*/
/*--- end ---*/
|