Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for linux mips64el #827

Merged
merged 4 commits into from
Jun 20, 2017
Merged

Add support for linux mips64el #827

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
535ccec
Add support for linux mips64el
theaoqi Jun 13, 2017
a6d2393
add linux-mips64el natives
theaoqi Jun 13, 2017
7b7603d
updated library path of mips64el, removed useless codes
theaoqi Jun 19, 2017
4a8f1b1
removed useless codes
theaoqi Jun 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
<os arch="ppc64le"/>
<os arch="ia64"/>
<os arch="aarch64"/>
<os arch="mips64el"/>
</or>
</and>
</condition>
Expand Down Expand Up @@ -252,6 +253,15 @@
<matches pattern="true" string="${build.isArmSoftFloat}"/>
</and>
</condition>
<condition property="jre.arch" value="mips64el">
<or>
<matches pattern="mips64el" string="${os.arch}"/>
<and>
<matches pattern="mips64" string="${os.arch}"/>
<matches pattern="little" string="${sun.cpu.endian}"/>
</and>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there evidence, that a JVM reports a mips64 running in little endian mode as only mips64. If so there other uses of os.arch would also need more attention. I only had a look at openjdk on debian and there mips64el was correctly reported as os.arch. If there is none, I would suggest to remove the second match (lines 259-262).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested Zero and OpenJDK 8 which is ported by Loongson, they both report mips64el. Therefore, I agree that the second match (lines 259-262) should be removed.

</or>
</condition>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed, in the following line the property jre.arch is set to os.arch and so no specialcase is needed here.


<property name="jre.arch" value="${os.arch}"/>

Expand Down Expand Up @@ -456,6 +466,8 @@ com/sun/jna/linux-ia64/libjnidispatch.so;
processor=ia64;osname=linux,
com/sun/jna/linux-sparcv9/libjnidispatch.so;
processor=sparcv9;osname=linux,
com/sun/jna/linux-mips64el/libjnidispatch.so;
processor=mips64el;osname=linux,

com/sun/jna/freebsd-x86/libjnidispatch.so;
processor=x86;osname=freebsd,
Expand Down Expand Up @@ -515,6 +527,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
<zipfileset src="${lib.native}/linux-sparcv9.jar"
includes="*jnidispatch*"
prefix="com/sun/jna/linux-sparcv9"/>
<zipfileset src="${lib.native}/linux-mips64el.jar"
includes="*jnidispatch*"
prefix="com/sun/jna/linux-mips64el"/>
<zipfileset src="${lib.native}/sunos-x86.jar"
includes="*jnidispatch*"
prefix="com/sun/jna/sunos-x86"/>
Expand Down Expand Up @@ -704,6 +719,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
<copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-ppc64.jar" overwrite="true"/>
<copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-ppc64le.jar" overwrite="true"/>
<copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-sparcv9.jar" overwrite="true"/>
<copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-mips64el.jar" overwrite="true"/>
<copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/freebsd-x86.jar" overwrite="true"/>
<copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/freebsd-x86-64.jar" overwrite="true"/>
<copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/openbsd-x86.jar" overwrite="true"/>
Expand Down
Binary file added lib/native/linux-mips64el.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/com/sun/jna/Native.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ static boolean isCompatibleVersion(String expectedVersion, String nativeVersion)
setProtected(true);
}
MAX_ALIGNMENT = Platform.isSPARC() || Platform.isWindows()
|| (Platform.isLinux() && (Platform.isARM() || Platform.isPPC()))
|| (Platform.isLinux() && (Platform.isARM() || Platform.isPPC() || Platform.isMIPS()))
|| Platform.isAIX()
|| Platform.isAndroid()
? 8 : LONG_SIZE;
Expand Down
3 changes: 3 additions & 0 deletions src/com/sun/jna/NativeLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,9 @@ else if (Platform.isARM()) {
cpu = "arm";
libc = "-gnueabi";
}
else if (Platform.isMIPS()) {
cpu = (Platform.is64Bit() ? "mips64el" : "mipsel");
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cpu is filled from Platform#getCanonicalArchitecture, so is this needed or does the JVM set the correct architecture? I would remove this, as this might also conflict with big-endian mips support.

I checked debian mips64el and there is also a different libc suffix: -gnueabi64:
/usr/lib/mips64el-linux-gnuabi64
So libc should be corrected. I suggest:

        else if (Platform.ARCH.equals("mips64el")) {
            libc = "-gnueabi64";
        }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked the path of libc.so for example,
Fedora (mips64el) : /usr/lib64/libc.so
Fedora (mips32el) : /usr/lib32/libc.so
Debian (mips64el): /usr/lib/mips64el-linux-gnuabi64/libc.so
Debian (mipsel): /lib/mipsel-linux-gnu/libc.so.6
Debian (mips): /lib/mips-linux-gnu/libc.so.6
The path under the situation of Fedora is set by:
"/usr/lib" + archPath

So on debian, I think you suggestion is correct. However, I think it should be
libc = "-gnuabi64";
rather than
libc = "-gnueabi64";

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with your assessment. I inserted a typo.


return cpu + kernel + libc;
}
Expand Down
14 changes: 14 additions & 0 deletions src/com/sun/jna/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ public static final boolean is64Bit() {
|| "ia64".equals(ARCH)
|| "ppc64".equals(ARCH) || "ppc64le".equals(ARCH)
|| "sparcv9".equals(ARCH)
|| "mips64".equals(ARCH) || "mips64el".equals(ARCH)
|| "amd64".equals(ARCH)) {
return true;
}
Expand Down Expand Up @@ -225,6 +226,16 @@ public static final boolean isSPARC() {
return ARCH.startsWith("sparc");
}

public static final boolean isMIPS() {
if (ARCH.equals("mips")
|| ARCH.equals("mips64")
|| ARCH.equals("mipsel")
|| ARCH.equals("mips64el")) {
return true;
}
return false;
}

static String getCanonicalArchitecture(String arch, boolean softfloat) {
arch = arch.toLowerCase().trim();
if ("powerpc".equals(arch)) {
Expand All @@ -248,6 +259,9 @@ else if ("x86_64".equals(arch) || "amd64".equals(arch)) {
if("arm".equals(arch) && softfloat) {
arch = "armel";
}
if ("mips64el".equals(arch)) {
arch = "mips64el";
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a NOOP, the arch is unmodified, so this change could be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this change should be removed.



return arch;
Expand Down