OpenJDK / jdk / hs
changeset 47292:ab3a898fff11
Merge
| author | jiangli |
|---|---|
| date | Thu, 28 Sep 2017 01:01:42 +0000 |
| parents | 0a0fae0c05ac 0f7dce1e7690 |
| children | 4d034d861e13 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/hotspot/lib/JvmFeatures.gmk Wed Sep 27 20:40:33 2017 -0400 +++ b/make/hotspot/lib/JvmFeatures.gmk Thu Sep 28 01:01:42 2017 +0000 @@ -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 Wed Sep 27 20:40:33 2017 -0400 +++ b/src/hotspot/share/compiler/oopMap.cpp Thu Sep 28 01:01:42 2017 +0000 @@ -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