Source: openjdk-9 Version: 9~b181-2 Severity: normal Tags: patch User: debian-sp...@lists.debian.org Usertags: sparc64
Hello! While working on upstreaming Debian's openjdk patches, I noticed that the patch to fix the Zero build on sparc64 can be simplified quite a bit. In fact, there are only two occasions where we need to disable SPARC-specific code for Zero to make the build succeed. I have updated the patch zero-sparc.diff accordingly and will also make sure it gets upstreamed in one form or another. Thanks, Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaub...@debian.org `. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
--- a/hotspot/src/share/vm/gc/shared/memset_with_concurrent_readers.hpp 2017-05-11 15:11:42.000000000 +0300 +++ b/hotspot/src/share/vm/gc/shared/memset_with_concurrent_readers.hpp 2017-06-07 14:50:39.835143370 +0300 @@ -37,7 +37,7 @@ // understanding that there may be concurrent readers of that memory. void memset_with_concurrent_readers(void* to, int value, size_t size); -#ifdef SPARC +#if defined(SPARC) && !defined(ZERO) // SPARC requires special handling. See SPARC-specific definition. --- a/hotspot/src/share/vm/compiler/oopMap.cpp~ 2017-05-11 15:11:42.000000000 +0300 +++ b/hotspot/src/share/vm/compiler/oopMap.cpp 2017-06-07 15:21:34.723210971 +0300 @@ -39,6 +39,6 @@ #ifdef COMPILER2 #include "opto/optoreg.hpp" #endif -#ifdef SPARC +#if defined (SPARC) && !defined(ZERO) #include "vmreg_sparc.inline.hpp" #endif