OpenJDK / jdk / hs
changeset 47289:0f7dce1e7690
8186578: Zero fails to build on linux-sparc due to sparc-specific code
Reviewed-by: kbarrett, ihse, coleenp
| author | glaubitz |
|---|---|
| date | Wed, 27 Sep 2017 17:01:34 +0200 |
| parents | 64ba55ba8516 |
| children | ab3a898fff11 |
| files | make/hotspot/lib/JvmFeatures.gmk src/hotspot/share/compiler/oopMap.cpp |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/hotspot/lib/JvmFeatures.gmk Thu Sep 21 14:32:05 2017 +0200 +++ b/make/hotspot/lib/JvmFeatures.gmk Wed Sep 27 17:01:34 2017 +0200 @@ -47,6 +47,9 @@ 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 ifeq ($(call check-jvm-feature, shark), true)
--- a/src/hotspot/share/compiler/oopMap.cpp Thu Sep 21 14:32:05 2017 +0200 +++ b/src/hotspot/share/compiler/oopMap.cpp Wed Sep 27 17:01:34 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,9 +40,6 @@ #ifdef COMPILER2 #include "opto/optoreg.hpp" #endif -#ifdef SPARC -#include "vmreg_sparc.inline.hpp" -#endif // OopMapStream