update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / coregrind / launcher-linux.c

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/launcher-linux.c b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/launcher-linux.c
index e7c9c7f7e0cdc54d0dfe5524fb445d0fe2562dfc..e70152dcef37c8ac8220886ebe08aed7c3fc1d28 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/launcher-linux.c
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/launcher-linux.c
@@ -205,6 +205,10 @@ static const char *select_platform(const char *clientname)
                 (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)) {
+               platform = "s390x-linux";
             }
          }
       }
@@ -278,7 +282,8 @@ int main(int argc, char** argv, char** envp)
        (0==strcmp(VG_PLATFORM,"amd64-linux")) ||
        (0==strcmp(VG_PLATFORM,"ppc32-linux")) ||
        (0==strcmp(VG_PLATFORM,"ppc64-linux")) ||
-       (0==strcmp(VG_PLATFORM,"arm-linux")))
+       (0==strcmp(VG_PLATFORM,"arm-linux"))   ||
+       (0==strcmp(VG_PLATFORM,"s390x-linux")))
       default_platform = VG_PLATFORM;
    else
       barf("Unknown VG_PLATFORM '%s'", VG_PLATFORM);