diff options
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 5 | ||||
| -rw-r--r-- | src/java/com/sun/gluegen/StructLayout.java | 3 | ||||
| -rwxr-xr-x | src/java/com/sun/gluegen/runtime/CPU.java | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml index a916c80..d18a29f 100755 --- a/make/gluegen-cpptasks.xml +++ b/make/gluegen-cpptasks.xml @@ -30,6 +30,7 @@ - configuration is exactly as specified. - - isFreeBSD + - isHPUX - isIA64 - isLinux - isLinuxAMD64 @@ -82,6 +83,9 @@ <condition property="isFreeBSD"> <os name="FreeBSD" /> </condition> + <condition property="isHPUX"> + <os name="HP-UX" /> + </condition> <condition property="isLinuxX86"> <and> <istrue value="${isLinux}" /> @@ -118,6 +122,7 @@ </condition> <echo message="FreeBSD=${isFreeBSD}" /> + <echo message="HPUX=${isHPUX}" /> <echo message="IA64=${isIA64}" /> <echo message="Linux=${isLinux}" /> <echo message="LinuxAMD64=${isLinuxAMD64}" /> diff --git a/src/java/com/sun/gluegen/StructLayout.java b/src/java/com/sun/gluegen/StructLayout.java index e7cd310..8dc4001 100644 --- a/src/java/com/sun/gluegen/StructLayout.java +++ b/src/java/com/sun/gluegen/StructLayout.java @@ -133,7 +133,8 @@ public class StructLayout { (os.startsWith("sunos") && cpu.equals("amd64")) || (os.startsWith("mac os") && cpu.equals("ppc")) || (os.startsWith("mac os") && cpu.equals("i386")) || - (os.startsWith("freebsd") && cpu.equals("i386")) + (os.startsWith("freebsd") && cpu.equals("i386")) || + (os.startsWith("hp-ux") && cpu.equals("pa_risc2.0")) ) { // FIXME: make struct alignment configurable? May need to change // packing rules on a per-type basis? diff --git a/src/java/com/sun/gluegen/runtime/CPU.java b/src/java/com/sun/gluegen/runtime/CPU.java index 66ff685..bb339d9 100755 --- a/src/java/com/sun/gluegen/runtime/CPU.java +++ b/src/java/com/sun/gluegen/runtime/CPU.java @@ -59,7 +59,8 @@ public class CPU { (os.startsWith("mac os") && cpu.equals("i386")) || (os.startsWith("sunos") && cpu.equals("sparc")) || (os.startsWith("sunos") && cpu.equals("x86")) || - (os.startsWith("freebsd") && cpu.equals("i386"))) { + (os.startsWith("freebsd") && cpu.equals("i386")) || + (os.startsWith("hp-ux") && cpu.equals("pa_risc2.0"))) { is32Bit = true; } else if ((os.startsWith("linux") && cpu.equals("amd64")) || (os.startsWith("linux") && cpu.equals("x86_64")) || |