Zero fails to build on SPARC again, similar to JDK-8186578

[John Paul Adrian Glaubitz]

On 04/09/2018 01:38 PM, John Paul Adrian Glaubitz wrote:
> This is reminiscent of JDK-8186578 and I would have expected the change made there
> to be still working [2]. The relative path to memset_with_concurrent_readers_sparc.cpp
> is still correct though.

I have already tried adding it to make/hotspot/lib/CompileJvm.gmk and make/lib/CoreLibraries.gmk:

diff -r a47d1e21b3f1 make/hotspot/lib/CompileJvm.gmk
--- a/make/hotspot/lib/CompileJvm.gmk   Thu Apr 05 10:54:53 2018 +0200
+++ b/make/hotspot/lib/CompileJvm.gmk   Tue Apr 10 13:28:59 2018 +0300
@@ -174,6 +174,14 @@
    JVM_EXCLUDE_PATTERNS += x86_32
  endif
  
+ifeq ($(call check-jvm-feature, zero), true)
+  JVM_CFLAGS_FEATURES += -DZERO -DCC_INTERP -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS)
+  JVM_LIBS_FEATURES += $(LIBFFI_LIBS)
+  ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
+    BUILD_LIBJVM_EXTRA_FILES := $(TOPDIR)/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp
+  endif
+endif
+
  # Inline assembly for solaris
  ifeq ($(OPENJDK_TARGET_OS), solaris)
    ifeq ($(OPENJDK_TARGET_CPU), x86_64)
diff -r a47d1e21b3f1 make/lib/CoreLibraries.gmk
--- a/make/lib/CoreLibraries.gmk        Thu Apr 05 10:54:53 2018 +0200
+++ b/make/lib/CoreLibraries.gmk        Tue Apr 10 13:28:59 2018 +0300
@@ -238,6 +238,9 @@
  
  ifeq ($(call check-jvm-variant, zero), true)
    ERGO_FAMILY := zero
+  ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
+    BUILD_LIBJVM_EXTRA_FILES := $(TOPDIR)/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp
+  endif
  else
    ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
      ERGO_FAMILY := i586

But that didn't help.

Any ideas?

Adrian

-- 
  .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz at debian.org
`. `'   Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
   `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913