Issue number:

Obtained from:
Submitted by:
Reviewed by:


Add proper 64 bit Sparcv9 detection.  These changes are necessary for 64
bit JOGL build on sparc solaris.

 Modified Files:
 	make/gluegen-cpptasks.xml
 	src/java/com/sun/gluegen/StructLayout.java
 	src/java/com/sun/gluegen/runtime/CPU.java
 ----------------------------------------------------------------------


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/trunk@30 a78bb65f-1512-4460-ba86-f6dc96a7bf27

3 files changed, 18 insertions, 1 deletions

diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index d4b9002..0eaa66a 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -38,6 +38,7 @@
    -   isLinuxX86
    -   isOSX
    -   isSolaris
+   -   isSolarisSparcv9
    -   isUnix
    -   isWindows
    -   isX11
@@ -77,7 +78,14 @@
       <os name="Linux" />
     </condition>
     <condition property="isSolaris">
-      <os name="SunOS" />
+      <and>
+         <os name="SunOS" />
+         <or>
+          <os arch="i386" />
+          <os arch="x86" />
+          <os arch="sparc" />
+         </or>
+      </and>
     </condition>
     <condition property="isWindows">
       <os family="windows" />
@@ -115,6 +123,12 @@
     <condition property="isIA64">
       <os arch="IA64" />
     </condition>
+    <condition property="isSolarisSparcv9">
+       <and>
+          <os name="SunOS" />
+          <os arch="sparcv9" />
+       </and>
+    </condition>
     <!-- Note: assumes X11 platform by default -->
     <condition property="isX11">
       <and>
@@ -132,6 +146,7 @@
     <echo message="LinuxX86=${isLinuxX86}" />
     <echo message="OS X=${isOSX}" />
     <echo message="Solaris=${isSolaris}" />
+    <echo message="SolarisSparcv9=${isSolarisSparcv9}" />
     <echo message="Unix=${isUnix}" />
     <echo message="Windows=${isWindows}" />
     <echo message="X11=${isX11}" />
diff --git a/src/java/com/sun/gluegen/StructLayout.java b/src/java/com/sun/gluegen/StructLayout.java
index b3a6ac5..175ff60 100644
--- a/src/java/com/sun/gluegen/StructLayout.java
+++ b/src/java/com/sun/gluegen/StructLayout.java
@@ -130,6 +130,7 @@ public class StructLayout {
         (os.startsWith("linux") && cpu.equals("x86_64")) ||
         (os.startsWith("linux") && cpu.equals("ia64")) ||
         (os.startsWith("sunos") && cpu.equals("sparc")) ||
+        (os.startsWith("sunos") && cpu.equals("sparcv9")) ||
         (os.startsWith("sunos") && cpu.equals("x86")) ||
         (os.startsWith("sunos") && cpu.equals("amd64")) ||
         (os.startsWith("mac os") && cpu.equals("ppc")) ||
diff --git a/src/java/com/sun/gluegen/runtime/CPU.java b/src/java/com/sun/gluegen/runtime/CPU.java
index ce187e4..a399b11 100755
--- a/src/java/com/sun/gluegen/runtime/CPU.java
+++ b/src/java/com/sun/gluegen/runtime/CPU.java
@@ -66,6 +66,7 @@ public class CPU {
                (os.startsWith("linux") && cpu.equals("amd64")) ||
                (os.startsWith("linux") && cpu.equals("x86_64")) ||
                (os.startsWith("linux") && cpu.equals("ia64")) ||
+               (os.startsWith("sunos") && cpu.equals("sparcv9")) ||
                (os.startsWith("sunos") && cpu.equals("amd64"))) {
     } else {
       throw new RuntimeException("Please port CPU detection (32/64 bit) to your platform (" + os + "/" + cpu + ")");