From 4f223cc4d6e29a2165b5475730351c0514a840f2 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Tue, 30 Jun 2009 16:01:57 -0700
Subject: [PATCH] (SIGAR-152) Add support for 31-bit s390 builds

---
 bindings/java/hyperic_jni/jni-build.xml                   | 4 ++--
 .../hyperic_jni/src/org/hyperic/jni/ArchNameTask.java     | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

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.
         <compilerarg value="-g" if="jni.debug"/>
         <compilerarg value="-Wall"/>
         <compilerarg value="-Werror" if="jni.werror"/>
-        <compilerarg value="-m64" if="jni.usem64"/>
+        <compilerarg value="${jni.gccm}" if="jni.gccm"/>
         <defineset>
           <define name="${jni.define.name}_LINUX"/>
           <define name="_REENTRANT"/>
@@ -349,7 +349,7 @@ USA.
         <libset if="jni.dmalloc"
                 dir="${jni.dmalloc}/lib"
                 libs="dmallocth"/>
-        <linkerarg value="-m64" if="jni.usem64"/>
+        <linkerarg value="${jni.gccm}" if="jni.gccm"/>
       </linker>
 
       <!-- Darwin -->
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");
+            }
+        }
     }
 }