Quantcast

Valgrind: r16386 - /trunk/coregrind/m_main.c

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Valgrind: r16386 - /trunk/coregrind/m_main.c

svn-2
Author: sewardj
Date: Tue May 16 10:30:50 2017
New Revision: 16386

Log:
Redo rev 16384 to use the "house" conditionalisation scheme.  Pertains to
BZ#368529.

Modified:
    trunk/coregrind/m_main.c

Modified: trunk/coregrind/m_main.c
==============================================================================
--- trunk/coregrind/m_main.c (original)
+++ trunk/coregrind/m_main.c Tue May 16 10:30:50 2017
@@ -2422,6 +2422,7 @@
    libgcc which boil down to an abort or raise, that's usually defined
    in libc. Instead, define them here. */
 #if defined(VGP_arm_linux)
+
 void raise(void);
 void raise(void){
    VG_(printf)("Something called raise().\n");
@@ -2440,7 +2441,15 @@
    vg_assert(0);
 }
 
-#if defined(__ANDROID__)
+#endif /* defined(VGP_arm_linux) */
+
+/* Some Android helpers.  See bug 368529. */
+#if defined(__clang__) \
+    && (defined(VGPV_arm_linux_android) \
+        || defined(VGPV_x86_linux_android) \
+        || defined(VGPV_mips32_linux_android) \
+        || defined(VGPV_arm64_linux_android))
+
 /* Replace __aeabi_memcpy* functions with vgPlain_memcpy. */
 void *__aeabi_memcpy(void *dest, const void *src, SizeT n);
 void *__aeabi_memcpy(void *dest, const void *src, SizeT n)
@@ -2478,8 +2487,7 @@
 {
     return VG_(memset)(dest, 0, n);
 }
-#endif /* defined(__ANDROID__) */
-#endif /* defined(VGP_arm_linux) */
+#endif /* clang and android, basically */
 
 /* ---------------- Requirement 2 ---------------- */
 


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Valgrind-developers mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
Loading...