[foreign-abi] On invokers

Nick Gasson nick.gasson at arm.com
Mon Oct 14 09:47:51 UTC 2019


Hi Jorn,

Thanks for the hint about git apply --recount. That works modulo the
two errors below that I fixed by just downloading the raw files.

error: patch failed: src/hotspot/cpu/x86/foreign_globals_x86.hpp:20
error: src/hotspot/cpu/x86/foreign_globals_x86.hpp: patch does not apply
error: patch failed: src/hotspot/cpu/x86/universalUpcallHandler_x86.cpp:194
error: src/hotspot/cpu/x86/universalUpcallHandler_x86.cpp: patch does not apply
panama.git.patch:4716: new blank line at EOF.


Nick

On 14/10/2019 16:56, Jorn Vernee wrote:
> Hi Nick,
> 
> Thanks for trying the patch. I'm using Git, so I'm using a port of the
> original webrev.ksh script. I've previously done a set of fixes to the
> port, since we were having off-by-one errors before, but apparently not
> all the bugs were fixed :/ (well, at least I now have a test case).
> 
> I'll look into a fix, but that's probably gonna take a while. In the
> mean time it might be fastest to manually fix the line count. Git also
> has an option to --recount the number of lines when applying a patch,
> but I couldn't find anything similar for HG unfortunately.
> 
> Sorry,
> Jorn
> 
> On 14/10/2019 08:19, Nick Gasson wrote:
>> Hi Jorn,
>>
>>> Here is an updated version that gets the build working on GCC:
>>> cr.openjdk.java.net/~jvernee/prog-back/webrev.03/
>>
>> I'm having trouble applying the patch file from this webrev (and also
>> the one from webrev.02).
>>
>> http://cr.openjdk.java.net/~jvernee/prog-back/webrev.03/panama.git.patch
>>
>> patching file src/hotspot/cpu/aarch64/directUpcallHandler_aarch64.cpp
>> patching file src/hotspot/cpu/x86/directUpcallHandler_x86.cpp
>> patching file src/hotspot/cpu/x86/foreign_globals_x86.cpp
>> patching file src/hotspot/cpu/x86/foreign_globals_x86.hpp
>> patch: **** malformed patch at line 697: @@ -66,6 +42,38 @@
>>
>> Looks like the added/removed line counts are off-by-one?
>>
>> Thanks,
>> Nick


More information about the panama-dev mailing list