zero broken in jdk/jdk? [resend ]

[Magnus Ihse Bursie]

On 2018-12-12 21:51, Chris Phillips wrote:
> Hi Magnus
>
> On 2018-12-12 1:53 p.m., "Chris Phillips"@T O wrote:
>> Hi Magnus,
>>
>> On 12/12/18 01:28 PM, Magnus Ihse Bursie wrote:
>>> I get the following build error when building zero in jdk/jdk:
>>>
>>> workspace/build/linux-x64-zero/hotspot/variant-zero/libjvm/objs/os_linux.o:
>>> In function `os::abort(bool, void*, void const*)':
>>> workspace/open/src/hotspot/os/linux/os_linux.cpp:1358: undefined
>>> reference to `ClassLoader::close_jrt_image()'
>>> collect2: error: ld returned 1 exit status
>>> lib/CompileJvm.gmk:172: recipe for target
>>> 'workspace/build/linux-x64-zero/support/modules_libs/java.base/server/libjvm.so'
>>> failed
>>>
>>> Is this a known problem?
>>>
>>> /Magnus
>>>
>>>
>> Not seen this before, will take a look.
>>
>> Chris
>>
>>
> Yes, somebody broke Zero  (Recent CDS change?)
>
> The following fixes it please do open a bug or shall I?
Please do. My interest in keeping zero buildable is not that high. :)

/Magnus

>
> diff --git a/src/hotspot/os/linux/os_linux.cpp
> b/src/hotspot/os/linux/os_linux.cpp
> --- a/src/hotspot/os/linux/os_linux.cpp
> +++ b/src/hotspot/os/linux/os_linux.cpp
> @@ -1354,9 +1354,11 @@
>   void os::abort(bool dump_core, void* siginfo, const void* context) {
>     os::shutdown();
>     if (dump_core) {
> +#ifndef INCLUDE_CDS
>       if (UseSharedSpaces && DumpPrivateMappingsInCore) {
>         ClassLoader::close_jrt_image();
>       }
> +#endif
>   #ifndef PRODUCT
>       fdStream out(defaultStream::output_fd());
>       out.print_raw("Current thread is ");
>
>
> Chris