Bug 681: Use ELF Header + ARM EABI Section Parsing in PlatformPropsImpl to to distinguish ARM soft-float/hard-float (part-2)

+    /**
+     * Returns the {@link ABIType} of the current platform using given {@link CPUType cpuType}
+     * and {@link OSType osType} as a hint.
+     * <p>
+     * Note the following queries are performed:
+     * <ul>
+     *   <li> not {@link CPUFamily#ARM} -> {@link ABIType#GENERIC_ABI} </li>
+     *   <li> else
+     *   <ul>
+     *     <li> not {@link OSType#LINUX} -> {@link ABIType#EABI_GNU_ARMEL} </li>
+     *     <li> else
+     *     <ul>
+     *       <li> Elf ARM Tags -> {@link ABIType#EABI_GNU_ARMEL}, {@link ABIType#EABI_GNU_ARMHF} </li>
+     *     </ul></li>
+     *   </ul></li>
+     * </ul>
+     * </p>
+     * <p>
+     * Elf ARM Tags are read using {@link ElfHeader}, .. and {@link SectionArmAttributes#abiVFPArgsAcceptsVFPVariant(byte)}.
+     * </p>
+     *
+     * @param cpuType
+     * @param osType
+     * @return
+     */
+    private static final ABIType queryABITypeImpl(CPUType cpuType, OSType osType) {

3 files changed, 11 insertions, 10 deletions

diff --git a/make/scripts/crosstest-java-linux-armv6-rel.sh b/make/scripts/crosstest-java-linux-armv6-rel.sh
index deee01e..92cd2d2 100644
--- a/make/scripts/crosstest-java-linux-armv6-rel.sh
+++ b/make/scripts/crosstest-java-linux-armv6-rel.sh
@@ -10,8 +10,8 @@ export ANT_PATH=/usr/share/ant
 export BUILD_DIR=../build-linux-armv6
 
 #TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter
-#TSTCLASS=com.jogamp.common.GlueGenVersion
-TSTCLASS=com.jogamp.common.os.TestElfReader01
+TSTCLASS=com.jogamp.common.GlueGenVersion
+#TSTCLASS=com.jogamp.common.os.TestElfReader01
 
 LOGFILE=`basename $0 .sh`.log
 
@@ -25,12 +25,12 @@ cd $TARGET_ROOT/gluegen/make ;
 LD_LIBRARY_PATH=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
 java \
   -Djava.library.path=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
-  -Djava.class.path=lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \
+  -cp lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:$BUILD_DIR/gluegen-rt.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \
   -Djogamp.debug.JNILibLoader=true \
   -Djogamp.debug.NativeLibrary=true \
   -Djogamp.debug.NativeLibrary.Lookup=true \
   -Djogamp.debug.ProcAddressHelper=true \
-  $TSTCLASS \
+  $* $TSTCLASS \
  2>&1 | tee $LOGFILE \
 "
 
diff --git a/make/scripts/crosstest-java-linux-armv6hf-rel.sh b/make/scripts/crosstest-java-linux-armv6hf-rel.sh
index 24dec99..9c40ede 100644
--- a/make/scripts/crosstest-java-linux-armv6hf-rel.sh
+++ b/make/scripts/crosstest-java-linux-armv6hf-rel.sh
@@ -10,8 +10,8 @@ export ANT_PATH=/usr/share/ant
 export BUILD_DIR=../build-linux-armv6hf
 
 #TSTCLASS=com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter
-#TSTCLASS=com.jogamp.common.GlueGenVersion
-TSTCLASS=com.jogamp.common.os.TestElfReader01
+TSTCLASS=com.jogamp.common.GlueGenVersion
+#TSTCLASS=com.jogamp.common.os.TestElfReader01
 
 LOGFILE=`basename $0 .sh`.log
 
@@ -25,12 +25,12 @@ cd $TARGET_ROOT/gluegen/make ;
 LD_LIBRARY_PATH=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
 java \
   -Djava.library.path=$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
-  -Djava.class.path=lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \
+  -cp lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:$BUILD_DIR/gluegen-rt.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \
   -Djogamp.debug.JNILibLoader=true \
   -Djogamp.debug.NativeLibrary=true \
   -Djogamp.debug.NativeLibrary.Lookup=true \
   -Djogamp.debug.ProcAddressHelper=true \
-  $TSTCLASS \
+  $* $TSTCLASS \
  2>&1 | tee $LOGFILE \
 "
 
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index b8af676..9f9a769 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -41,6 +41,7 @@ rm -f $LOG
 
 #D_ARGS="-Djogamp.debug.ProcAddressHelper=true -Djogamp.debug.NativeLibrary=true"
 #D_ARGS="-Djogamp.debug.TraceLock"
+D_ARGS="-Djogamp.debug.Platform"
 #D_ARGS="-Djogamp.debug.JarUtil"
 #D_ARGS="-Djogamp.debug.TempJarCache"
 #D_ARGS="-Djogamp.debug.TempFileCache"
@@ -69,8 +70,8 @@ function onetest() {
     java -cp $CLASSPATH $D_ARGS -Djava.library.path=$libspath $*
     echo
 }
-
-#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
+#
+onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG