Skip to content

Commit

Permalink
Merge pull request #961 from matthiasblaesing/armsoftfloat2
Browse files Browse the repository at this point in the history
Parse Arm EABI section to detect hard-/softfloat usage
  • Loading branch information
matthiasblaesing authored May 27, 2018
2 parents 0074b9e + 189ddb6 commit 949d70e
Show file tree
Hide file tree
Showing 12 changed files with 520 additions and 55 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Features
Bug Fixes
---------
* [#925](https://github.com/java-native-access/jna/issues/925): Optimize `Structure#validate` and prevent `ArrayIndexOutOfBoundsException` in `SAFEARRAY#read` for zero dimensions - [@matthiasblaesing](https://github.com/matthiasblaesing).
* [#958](https://github.com/java-native-access/jna/issues/958): Update for PR 863: Old toolchains produce binaries without hard-/softfloat markers. Rasbian is missinng the markers and the oracle JDK is also affected. For hardfloat detection now also the Arm EABI section is also considered - [@matthiasblaesing](https://github.com/matthiasblaesing).

Release 4.5.1
=============
Expand Down
2 changes: 1 addition & 1 deletion ant-tools-src/com/sun/jna/BuildArmSoftFloatDetector.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void execute() throws IOException {
// The self.getCanonicalPath() resolves the symblink to the backing
// realfile and passes that to the detection routines
ELFAnalyser ahfd = ELFAnalyser.analyse(self.getCanonicalPath());
result = ahfd.isArmSoftFloat();
result = ! ahfd.isArmHardFloat();
} catch (IOException ex) {
result = false;
}
Expand Down
6 changes: 6 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1015,11 +1015,17 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
<include name="*testlib-jar*"/>
</fileset>
</copy>
<copy todir="${test.classes}">
<fileset dir="${test.src}">
<include name="**/data/**" />
</fileset>
</copy>
<!-- Create a jar for easy movement of tests, and jar load test -->
<jar jarfile="${build}/${testjar}">
<fileset dir="${test.classes}">
<patternset refid="jar-compiled"/>
<include name="**/*testlib-jar*"/>
<include name="**/data/**" />
</fileset>
<manifest>
<attribute name="permissions" value="all-permissions"/>
Expand Down
2 changes: 1 addition & 1 deletion native/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ OS=$(shell uname | sed -e 's/CYGWIN.*/win32/g' \
-e 's/AIX.*/aix/g' \
-e 's/Linux.*/linux/g')

JNA_JNI_VERSION=5.1.0 # auto-generated by ant
JNA_JNI_VERSION=5.2.0 # auto-generated by ant
CHECKSUM=74e8f8e397c43487738c5c1f1363498b # auto-generated by ant

JAVA_INCLUDES=-I"$(JAVA_HOME)/include" \
Expand Down
Loading

0 comments on commit 949d70e

Please sign in to comment.