# HG changeset patch
# User andrew
# Date 1616013715 0
# Node ID d21a3fc77eca3ebdc25a3778debfc1dd0ed01878
# Parent  9d362a0bae2ce19d6288817214d727e743b8b043# Parent  616812f93bca71c1143282cb7bd74e7909abb444
Merge

diff -r 9d362a0bae2c -r d21a3fc77eca .hgtags
--- 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
diff -r 9d362a0bae2c -r d21a3fc77eca make/linux/makefiles/defs.make
--- 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