From e5bee404cee9432d5c910e980a2e3e21fa69c7b2 Mon Sep 17 00:00:00 2001 From: Tomas Kolda Date: Mon, 18 Jun 2018 09:42:29 -0700 Subject: [PATCH] zLinux s390x support in JNI (#4009) Summary: Adding support for zLinux on s390x architecture in JNI. Closes https://github.com/facebook/rocksdb/pull/4009 Differential Revision: D8483750 Pulled By: siying fbshipit-source-id: e681657c27e7a28f1731e08e8570382de5deff44 --- java/src/main/java/org/rocksdb/util/Environment.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/src/main/java/org/rocksdb/util/Environment.java b/java/src/main/java/org/rocksdb/util/Environment.java index 7e1b50cff..bf005a348 100644 --- a/java/src/main/java/org/rocksdb/util/Environment.java +++ b/java/src/main/java/org/rocksdb/util/Environment.java @@ -8,6 +8,10 @@ public class Environment { return ARCH.contains("ppc"); } + public static boolean isS390x() { + return ARCH.contains("s390x"); + } + public static boolean isWindows() { return (OS.contains("win")); } @@ -57,6 +61,8 @@ public class Environment { final String arch = is64Bit() ? "64" : "32"; if(isPowerPC()) { return String.format("%sjni-linux-%s", name, ARCH); + } else if(isS390x()) { + return String.format("%sjni-linux%s", name, ARCH); } else { return String.format("%sjni-linux%s", name, arch); }