View | Details | Raw Unified | Return to bug 1246
Collapse All | Expand All

(-)gluegen2/make/scripts/make.gluegen.all.linux-ppc64le.sh (+24 lines)
Line 0 Link Here
1
#! /bin/sh
2
3
#    -Dc.compiler.debug=true \
4
#    -Dgluegen.cpptasks.detected.os=true \
5
#    -DisUnix=true \
6
#    -DisLinux=true \
7
#    -DisLinuxX86=true \
8
#    -DisX11=true \
9
10
MACHINE=ppc64le
11
ARCH=ppc64el
12
TRIPLET=powerpc64le-linux-gnu
13
14
export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET
15
export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE
16
17
export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml"
18
19
#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
20
export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
21
22
ant \
23
    -Drootrel.build=build-linux-$MACHINE \
24
    $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log
(-)gluegen2/make/gluegen-cpptasks-base.xml (-2 / +29 lines)
Lines 48-53 Link Here
48
   -   isLinuxMips
48
   -   isLinuxMips
49
   -   isLinuxMipsel
49
   -   isLinuxMipsel
50
   -   isLinuxPpc
50
   -   isLinuxPpc
51
   -   isLinuxPpc64le
51
   -   isLinuxs390
52
   -   isLinuxs390
52
   -   isLinuxs390x
53
   -   isLinuxs390x
53
   -   isLinuxSparc
54
   -   isLinuxSparc
Lines 133-138 Link Here
133
   -   compiler.cfg.linux.mips
134
   -   compiler.cfg.linux.mips
134
   -   compiler.cfg.linux.mipsel
135
   -   compiler.cfg.linux.mipsel
135
   -   compiler.cfg.linux.ppc
136
   -   compiler.cfg.linux.ppc
137
   -   compiler.cfg.linux.ppc64le
136
   -   compiler.cfg.linux.s390
138
   -   compiler.cfg.linux.s390
137
   -   compiler.cfg.linux.s390x
139
   -   compiler.cfg.linux.s390x
138
   -   compiler.cfg.linux.sparc
140
   -   compiler.cfg.linux.sparc
Lines 155-160 Link Here
155
   -   linker.cfg.linux.mips
157
   -   linker.cfg.linux.mips
156
   -   linker.cfg.linux.mipsel
158
   -   linker.cfg.linux.mipsel
157
   -   linker.cfg.linux.ppc
159
   -   linker.cfg.linux.ppc
160
   -   linker.cfg.linux.ppc64le
158
   -   linker.cfg.linux.s390
161
   -   linker.cfg.linux.s390
159
   -   linker.cfg.linux.s390x
162
   -   linker.cfg.linux.s390x
160
   -   linker.cfg.linux.sparc
163
   -   linker.cfg.linux.sparc
Lines 417-422 Link Here
417
    <condition property="ppc">
420
    <condition property="ppc">
418
      <os arch="ppc" />
421
      <os arch="ppc" />
419
    </condition>
422
    </condition>
423
    <condition property="isLinuxPpc64le">
424
      <and>
425
        <istrue value="${isLinux}" />
426
        <os arch="ppc64le" />
427
      </and>
428
    </condition>
429
    <condition property="ppc64le">
430
      <os arch="ppc64le" />
431
    </condition>
420
    <condition property="isLinuxs390">
432
    <condition property="isLinuxs390">
421
      <and>
433
      <and>
422
        <istrue value="${isLinux}" />
434
        <istrue value="${isLinux}" />
Lines 601-606 Link Here
601
    <echo message="LinuxMips=${isLinuxMips}" />
613
    <echo message="LinuxMips=${isLinuxMips}" />
602
    <echo message="LinuxMipsel=${isLinuxMipsel}" />
614
    <echo message="LinuxMipsel=${isLinuxMipsel}" />
603
    <echo message="LinuxPpc=${isLinuxPpc}" />
615
    <echo message="LinuxPpc=${isLinuxPpc}" />
616
    <echo message="LinuxPpc64le=${isLinuxPpc64le}" />
604
    <echo message="Linuxs390=${isLinuxs390}" />
617
    <echo message="Linuxs390=${isLinuxs390}" />
605
    <echo message="Linuxs390x=${isLinuxs390x}" />
618
    <echo message="Linuxs390x=${isLinuxs390x}" />
606
    <echo message="LinuxSparc=${isLinuxSparc}" />
619
    <echo message="LinuxSparc=${isLinuxSparc}" />
Lines 683-688 Link Here
683
    <property name="os.and.arch" value="linux-ppc" />
696
    <property name="os.and.arch" value="linux-ppc" />
684
  </target>
697
  </target>
685
698
699
  <target name="gluegen.cpptasks.detect.os.linux.ppc64le" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64le">
700
    <property name="os.and.arch" value="linux-ppc64le" />
701
  </target>
702
686
  <target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390">
703
  <target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390">
687
    <property name="os.and.arch" value="linux-s390" />
704
    <property name="os.and.arch" value="linux-s390" />
688
  </target>
705
  </target>
Lines 707-713 Link Here
707
    <property name="os.and.arch" value="android-aarch64" />
724
    <property name="os.and.arch" value="android-aarch64" />
708
  </target>
725
  </target>
709
726
710
  <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
727
  <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
711
728
712
  <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
729
  <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
713
    <property name="native.library.suffix"     value="*lib" />
730
    <property name="native.library.suffix"     value="*lib" />
Lines 1268-1273 Link Here
1268
    <linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
1285
    <linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
1269
    </linker>
1286
    </linker>
1270
1287
1288
    <linker id="linker.cfg.linux.ppc64le" name="${gcc.compat.compiler}">
1289
    </linker>
1290
1271
    <linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}">
1291
    <linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}">
1272
    </linker>
1292
    </linker>
1273
1293
Lines 1499-1504 Link Here
1499
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ppc" />
1519
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ppc" />
1500
    </target>
1520
    </target>
1501
1521
1522
    <target name="gluegen.cpptasks.declare.compiler.linux.ppc64le" if="isLinuxPpc64le">
1523
      <echo message="Linux.Ppc64le" />
1524
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" />
1525
      <property name="linker.cfg.id.base"            value="linker.cfg.linux" />
1526
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ppc64le" />
1527
    </target>
1528
1502
    <target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
1529
    <target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
1503
      <echo message="Linux.s390" />
1530
      <echo message="Linux.s390" />
1504
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
1531
      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
Lines 1520-1526 Link Here
1520
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/sparc" />
1547
      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/sparc" />
1521
    </target>
1548
    </target>
1522
1549
1523
    <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
1550
    <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
1524
        <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
1551
        <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
1525
    </target>
1552
    </target>
1526
1553
(-)gluegen2/src/java/jogamp/common/os/PlatformPropsImpl.java (-1 / +2 lines)
Lines 509-514 public abstract class PlatformPropsImpl Link Here
509
     *   <li>linux-armv6hf</li>
509
     *   <li>linux-armv6hf</li>
510
     *   <li>linux-i586</li>
510
     *   <li>linux-i586</li>
511
     *   <li>linux-ppc</li>
511
     *   <li>linux-ppc</li>
512
     *   <li>linux-ppc64le</li>
512
     *   <li>linux-mips</li>
513
     *   <li>linux-mips</li>
513
     *   <li>linux-mipsel</li>
514
     *   <li>linux-mipsel</li>
514
     *   <li>linux-superh</li>
515
     *   <li>linux-superh</li>
Lines 572-578 public abstract class PlatformPropsImpl Link Here
572
                _and_arch_tmp = "amd64";
573
                _and_arch_tmp = "amd64";
573
                break;
574
                break;
574
            case PPC64:
575
            case PPC64:
575
                _and_arch_tmp = "ppc64";
576
                _and_arch_tmp = littleEndian ? "ppc64le" : "ppc64";
576
                break;
577
                break;
577
            case MIPS_64:
578
            case MIPS_64:
578
                _and_arch_tmp = "mips64";
579
                _and_arch_tmp = "mips64";
(-)gluegen2/src/java/com/jogamp/common/os/MachineDataInfo.java (-1 / +4 lines)
Lines 63-68 public class MachineDataInfo { Link Here
63
  private final static int[] size_sparc_32_sunos  =  { 4,    4,     4,     8,     16,    4,   8192 };
63
  private final static int[] size_sparc_32_sunos  =  { 4,    4,     4,     8,     16,    4,   8192 };
64
  private final static int[] size_x86_32_windows  =  { 4,    4,     4,     8,     12,    4,   4096 };
64
  private final static int[] size_x86_32_windows  =  { 4,    4,     4,     8,     12,    4,   4096 };
65
  private final static int[] size_lp64_unix       =  { 4,    8,     4,     8,     16,    8,   4096 };
65
  private final static int[] size_lp64_unix       =  { 4,    8,     4,     8,     16,    8,   4096 };
66
  private final static int[] size_ppc_64_unix     =  { 4,    8,     4,     8,     16,    8,  65536 };
66
  private final static int[] size_x86_64_windows  =  { 4,    4,     4,     8,     16,    8,   4096 };
67
  private final static int[] size_x86_64_windows  =  { 4,    4,     4,     8,     16,    8,   4096 };
67
68
68
  /*                               arch   os          i8, i16, i32, i64, int, long, float, doubl, ldoubl, ptr */
69
  /*                               arch   os          i8, i16, i32, i64, int, long, float, doubl, ldoubl, ptr */
Lines 106-113 public class MachineDataInfo { Link Here
106
      SPARC_32_SUNOS( size_sparc_32_sunos, align_sparc_32_sunos),
107
      SPARC_32_SUNOS( size_sparc_32_sunos, align_sparc_32_sunos),
107
      /** {@link Platform.CPUType#X86_32} Windows */
108
      /** {@link Platform.CPUType#X86_32} Windows */
108
      X86_32_WINDOWS( size_x86_32_windows, align_x86_32_windows),
109
      X86_32_WINDOWS( size_x86_32_windows, align_x86_32_windows),
109
      /** LP64 Unix, e.g.: {@link Platform.CPUType#X86_64} Unix, {@link Platform.CPUType#ARM64} EABI, {@link Platform.CPUType#PPC64} Unix, .. */
110
      /** LP64 Unix, e.g.: {@link Platform.CPUType#X86_64} Unix, {@link Platform.CPUType#ARM64} EABI, .. */
110
      LP64_UNIX(      size_lp64_unix,    align_lp64_unix),
111
      LP64_UNIX(      size_lp64_unix,    align_lp64_unix),
112
      /** {@link Platform.CPUType#PPC64} Unix */
113
      PPC_64_UNIX(      size_ppc_64_unix,    align_lp64_unix),
111
      /** {@link Platform.CPUType#X86_64} Windows */
114
      /** {@link Platform.CPUType#X86_64} Windows */
112
      X86_64_WINDOWS( size_x86_64_windows, align_x86_64_windows);
115
      X86_64_WINDOWS( size_x86_64_windows, align_x86_64_windows);
113
      // 8
116
      // 8
(-)gluegen2/src/java/jogamp/common/os/MachineDataInfoRuntime.java (+2 lines)
Lines 112-117 public class MachineDataInfoRuntime { Link Here
112
      } else {
112
      } else {
113
          if( osType == Platform.OSType.WINDOWS ) {
113
          if( osType == Platform.OSType.WINDOWS ) {
114
              return StaticConfig.X86_64_WINDOWS;
114
              return StaticConfig.X86_64_WINDOWS;
115
          } else if ( Platform.CPUType.PPC64 == cpuType ) {
116
              return StaticConfig.PPC_64_UNIX;
115
          } else {
117
          } else {
116
              // for all 64bit unix types (x86_64, aarch64, sparcv9, ..)
118
              // for all 64bit unix types (x86_64, aarch64, sparcv9, ..)
117
              return StaticConfig.LP64_UNIX;
119
              return StaticConfig.LP64_UNIX;
(-)gluegen2/make/build.xml (-1 / +7 lines)
Lines 299-304 Link Here
299
      <property name="linker.cfg.id"                        value="linker.cfg.linux.ppc" /> 
299
      <property name="linker.cfg.id"                        value="linker.cfg.linux.ppc" /> 
300
    </target>
300
    </target>
301
301
302
    <target name="declare.linux.ppc64le" if="isLinuxPpc64le">
303
      <echo message="Linux.ppc64le" />
304
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
305
      <property name="linker.cfg.id"                        value="linker.cfg.linux.ppc64le" /> 
306
    </target>
307
302
    <target name="declare.linux.s390" if="isLinuxs390">
308
    <target name="declare.linux.s390" if="isLinuxs390">
303
      <echo message="Linux.s390" />
309
      <echo message="Linux.s390" />
304
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
310
      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" /> 
Lines 317-323 Link Here
317
      <property name="linker.cfg.id"                        value="linker.cfg.linux.sparc" /> 
323
      <property name="linker.cfg.id"                        value="linker.cfg.linux.sparc" /> 
318
    </target>
324
    </target>
319
    
325
    
320
    <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
326
    <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
321
      <property name="c.src.dir.os"                         value="unix" />
327
      <property name="c.src.dir.os"                         value="unix" />
322
      <property name="java.includes.dir.platform"           value="${java.includes.dir}/linux" />
328
      <property name="java.includes.dir.platform"           value="${java.includes.dir}/linux" />
323
    </target>
329
    </target>

Return to bug 1246