!337 I5HCF0: The gun-debug is missing in vm.make

From: @kuenking111 
Reviewed-by: @jvmboy 
Signed-off-by: @jvmboy

openjdk-1.8.0.spec

@@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{buildver}
-Release: 6
+Release: 7
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -1075,7 +1075,6 @@ Patch177: downgrade-symver-of-memcpy-GLIBC.patch
 Patch178: fix-log-bug-enhance-aes-hmac-performance.patch
 Patch179: keep-the-binary-equal.patch
 Patch180: link-option-use-rpath-instead-of-runpath.patch
-Patch181: remove-gnu-debuglink-when-using-enable-debug-.patch
 Patch183: revert-windows-bugfix.patch
 Patch184: set-vm.vendor-by-configure.patch
 Patch185: update-cacerts-and-VerifyCACerts.java-test.patch
@@ -1566,7 +1565,6 @@ pushd %{top_level_dir_name}
 %patch178 -p1
 %patch179 -p1
 %patch180 -p1
-%patch181 -p1
 %patch183 -p1
 %patch184 -p1
 %patch185 -p1
@@ -2246,6 +2244,9 @@ cjc.mainProgram(arg)
 %endif
 
 %changelog
+* Fri Jul 15 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.332-b09.7
+- del remove-gnu-debuglink-when-using-enable-debug-.patch
+
 * Mon Jul 4 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.332-b09.6
 - add 8067941-TESTBUG-Fix-tests-for-OS-with-64K-page-size.patch
 

remove-gnu-debuglink-when-using-enable-debug-.patch

@@ -1,68 +0,0 @@
-From 39774b66e6b962a89a02504f08c20b309f9eef1f Mon Sep 17 00:00:00 2001
-From: zhangyipeng <zhangyipeng7@huawei.com>
-Date: Thu, 4 Mar 2021 10:10:30 +0800
-Subject: [PATCH] [Huawei]remove gnu debuglink when using enable debug
- symbols
-
-
-
-Signed-off-by: Sun Jianye  <sunjianye@huawei.com>
----
- hotspot/make/linux/makefiles/jsig.make   | 1 -
- hotspot/make/linux/makefiles/saproc.make | 1 -
- hotspot/make/linux/makefiles/vm.make     | 1 -
- make/common/NativeCompilation.gmk        | 2 +-
- 4 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/hotspot/make/linux/makefiles/jsig.make b/hotspot/make/linux/makefiles/jsig.make
-index 6290db5af..9838a50aa 100644
---- a/hotspot/make/linux/makefiles/jsig.make
-+++ b/hotspot/make/linux/makefiles/jsig.make
-@@ -63,7 +63,6 @@ $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-   ifneq ($(STRIP_POLICY),no_strip)
- 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
--	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
-   endif
-   ifeq ($(STRIP_POLICY),all_strip)
- 	$(QUIETLY) $(STRIP) $@
-diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make
-index ffc0ec5ce..dfeb254da 100644
---- a/hotspot/make/linux/makefiles/saproc.make
-+++ b/hotspot/make/linux/makefiles/saproc.make
-@@ -107,7 +107,6 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-   ifneq ($(STRIP_POLICY),no_strip)
- 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
--	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
-   endif
-   ifeq ($(STRIP_POLICY),all_strip)
- 	$(QUIETLY) $(STRIP) $@
-diff --git a/hotspot/make/linux/makefiles/vm.make b/hotspot/make/linux/makefiles/vm.make
-index 1985db071..408b0cc9d 100644
---- a/hotspot/make/linux/makefiles/vm.make
-+++ b/hotspot/make/linux/makefiles/vm.make
-@@ -359,7 +359,6 @@ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-   ifneq ($(STRIP_POLICY),no_strip)
- 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
--	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
-   endif
-   ifeq ($(STRIP_POLICY),all_strip)
- 	$(QUIETLY) $(STRIP) $@
-diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
-index 9980e8ab9..4fa9f14cf 100644
---- a/make/common/NativeCompilation.gmk
-+++ b/make/common/NativeCompilation.gmk
-@@ -487,7 +487,7 @@ define SetupNativeCompilation
-             $$($1_DEBUGINFO_FILES): $$($1_TARGET)
- 		$(RM) $$@
- 		$(OBJCOPY) --only-keep-debug $$< $$@
--		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-+		$(CD) $$(@D)
- 		$(TOUCH) $$@
-           endif
-         else ifeq ($(OPENJDK_TARGET_OS), aix)
--- 
-2.19.0
-