hg: panama/dev: manual merge with foreign

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Fri Jan 11 17:02:49 UTC 2019


Changeset: 620639776d0c
Author:    mcimadamore
Date:      2019-01-11 17:02 +0000
URL:       http://hg.openjdk.java.net/panama/dev/rev/620639776d0c

manual merge with foreign

! src/hotspot/share/prims/nativeLookup.cpp
- src/hotspot/share/prims/sysVx86ABI.cpp
+ src/hotspot/share/prims/upcallStubs.cpp
! src/java.base/share/classes/jdk/internal/foreign/abi/UniversalNativeInvoker.java
! src/java.base/share/classes/jdk/internal/foreign/abi/UniversalUpcallHandler.java
! src/java.base/share/classes/jdk/internal/foreign/abi/VarargsInvoker.java
+ src/java.base/share/classes/jdk/internal/foreign/abi/x64/ArgumentClass.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/ArgumentClass.java
! src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/Constants.java
! src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/StandardCall.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/StorageNames.java
! src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVx64ABI.java
+ test/jdk/java/foreign/abi/x64/ArgumentClassTest.java
+ test/jdk/java/foreign/abi/x64/BitMatrix.java
- test/jdk/java/foreign/abi/x64/sysv/ArgumentClassTest.java
- test/jdk/java/foreign/abi/x64/sysv/BitMatrix.java



More information about the panama-dev mailing list