Mercurial > hg > openjdk > jdk8u > hotspot
changeset 9420:d21a3fc77eca
Merge
author | andrew |
---|---|
date | Wed, 17 Mar 2021 20:41:55 +0000 |
parents | 9d362a0bae2c (current diff) 616812f93bca (diff) |
children | 2d0ba7271ce2 |
files | |
diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Mar 11 16:59:33 2021 +0800 +++ b/.hgtags Wed Mar 17 20:41:55 2021 +0000 @@ -1351,3 +1351,5 @@ 306a4643e4d22f7558b4a725708cb39c82ac1cc1 jdk8u292-b03 16bc2fd11c4c62b01473221b1b6b892a63723e18 jdk8u292-b04 a435c913c8ce30f0487d05cfec1d9be3fcc57f10 jdk8u292-b05 +a5795acea81480d6377dbc5256d82e2f25cd7394 jdk8u292-b06 +f206e4bfcef993ce5a75ed54612f045ca047abd3 jdk8u292-b07
--- a/make/linux/makefiles/defs.make Thu Mar 11 16:59:33 2021 +0800 +++ b/make/linux/makefiles/defs.make Wed Mar 17 20:41:55 2021 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2021, 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 @@ -314,11 +314,13 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifneq ($(STRIP_POLICY),no_strip) ifeq ($(ZIP_DEBUGINFO_FILES),1) - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz - ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz + ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz + ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz + ADD_SA_BINARIES/aarch64 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz else - ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo - ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ADD_SA_BINARIES/aarch64 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo endif endif endif