RFR(S): 8033154: PPC64: Fix AIX build after integration into jdk9/dev

Volker Simonis volker.simonis at gmail.com
Wed Jan 29 09:59:27 PST 2014


Hi,

please review the following small change:

http://cr.openjdk.java.net/~simonis/webrevs/8033154/

which fixes the AIX build after the integration of
ppc-aix-port/stage-9/jdk to jdk9/dev/jdk.

I would ideally like to push this change to jdk9/hs-comp/jdk because
that's the only repository where there's currently a complete AIX
port. However if that is not possible, I'll push it to jdk9/dev/jdk
and wait until it gets synced with jdk9/hs-comp again.

Please notice that this change is also intended for downport into 8u,
but I don't expect this to be a problem because it only contains
AIX-specific coding.

The main problem with the integration was caused by change "8032451:
(dc) DatagramChannel.join should support include-mode filtering on OS
X" which was already in jdk9/dev/jdk but not in
ppc-aix-port/stage-9/jdk. It caused some issues which will be solved
with this change:


make/lib/NioLibraries.gmk
src/aix/native/sun/nio/ch/AixNativeThread.c

8032451 did some changes to NativeThread.c. Instead of adding another
platform specific section to that file I've moved the AIX
implementation to it's own file which will only be used during the AIX
port. Notice that the changes in the makefile are in a AIX-specific
section and won't affect any other platform.


src/solaris/native/sun/nio/ch/Net.c

8032451 removed some specific coding which was used by AIX as well. To
re-enable the build on AIX 5.3 we have to define the two structures
'ip_mreq_source' and 'group_source_req' on that platform.


src/solaris/classes/sun/net/PortConfig.java

This is another file which wasn't present in our stage-9/jdk
repository but in the new jdk9/dev/jdk. Just added the required,
AIX-specific section to the file.


src/share/lib/security/java.security-aix

Recent changes have updated the various
src/share/lib/security/java.security* files. Without these changes,
the JDK failes to pass the
java/lang/SecurityManager/CheckPackageAccess.java jtreg regression
test. I've just updated java.security-aix to be the same like the
corresponding Linux version (as this was done - and agreed upon that
it is OK - in the initial AIX change).

Regards,
Volker


More information about the security-dev mailing list