diff --git a/bindings/java/hyperic_jni/jni-build.xml b/bindings/java/hyperic_jni/jni-build.xml
index 0172b1d1..7c0d0631 100644
--- a/bindings/java/hyperic_jni/jni-build.xml
+++ b/bindings/java/hyperic_jni/jni-build.xml
@@ -334,7 +334,7 @@ USA.
-
+
@@ -349,7 +349,7 @@ USA.
-
+
diff --git a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
index c076ce54..4041b134 100644
--- a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
+++ b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
@@ -68,9 +68,15 @@ public class ArchNameTask extends Task {
getProject().setProperty("jni.arch64", "true");
if (ArchLoader.IS_LINUX) {
if (!osArch.equals("ia64")) {
- getProject().setProperty("jni.usem64", "true");
+ getProject().setProperty("jni.gccm", "-m64");
}
}
}
+ else {
+ if (ArchLoader.IS_LINUX && osArch.equals("s390")) {
+ //gcc defaults to m64 on s390x platforms
+ getProject().setProperty("jni.gccm", "-m31");
+ }
+ }
}
}