From: Julian Seward <jseward@acm.org>
Date: Tue, 12 Jul 2011 10:59:27 +0000 (+0000)
Subject: Conditionalise code that uses some ELF constants that Android doesn't
X-Git-Tag: svn/VALGRIND_3_7_0~353
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=207ec5bf77aa9c0b6d052648e6e4a40634280590;p=thirdparty%2Fvalgrind.git

Conditionalise code that uses some ELF constants that Android doesn't
know about, and remove three unnecessary #defines.



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

diff --git a/coregrind/launcher-linux.c b/coregrind/launcher-linux.c
index e70152dcef..902d175920 100644
--- a/coregrind/launcher-linux.c
+++ b/coregrind/launcher-linux.c
@@ -47,12 +47,9 @@
 #include <elf.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
-#include <sys/user.h>
 #include <unistd.h>
 
 
@@ -201,15 +198,19 @@ static const char *select_platform(const char *clientname)
                platform = "amd64-linux";
             }
          } else if (header[EI_DATA] == ELFDATA2MSB) {
+#           if !defined(VGPV_arm_linux_android)
             if (ehdr->e_machine == EM_PPC64 &&
                 (ehdr->e_ident[EI_OSABI] == ELFOSABI_SYSV ||
                  ehdr->e_ident[EI_OSABI] == ELFOSABI_LINUX)) {
                platform = "ppc64-linux";
-            } else if (ehdr->e_machine == EM_S390 &&
-                       (ehdr->e_ident[EI_OSABI] == ELFOSABI_SYSV ||
-                        ehdr->e_ident[EI_OSABI] == ELFOSABI_LINUX)) {
+            } 
+            else 
+            if (ehdr->e_machine == EM_S390 &&
+                (ehdr->e_ident[EI_OSABI] == ELFOSABI_SYSV ||
+                 ehdr->e_ident[EI_OSABI] == ELFOSABI_LINUX)) {
                platform = "s390x-linux";
             }
+#           endif
          }
       }
    }