I506YS: Downgrade symbols to provide compalibility to lower glibc

downgrade-the-glibc-symver-of-log2f-posix_spawn.patch

@@ -0,0 +1,47 @@
+From f03f70daa59157adcab807b393db21d57da33e23 Mon Sep 17 00:00:00 2001
+From: sunjianye <sunjianye@huawei.com>
+Date: Tue, 26 Oct 2021 15:49:42 +0800
+Subject: [PATCH] downgrade the glibc symver of log2f & posix_spawn
+
+---
+ src/hotspot/share/opto/parse2.cpp                  | 8 ++++++++
+ src/java.base/unix/native/libjava/ProcessImpl_md.c | 4 ++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
+index becd187..9bbcb0c 100644
+--- a/src/hotspot/share/opto/parse2.cpp
++++ b/src/hotspot/share/opto/parse2.cpp
+@@ -45,6 +45,14 @@
+ #include "runtime/deoptimization.hpp"
+ #include "runtime/sharedRuntime.hpp"
+ 
++#ifdef AARCH64
++  __asm__(".symver log2f,log2f@GLIBC_2.17");
++#endif
++
++#ifdef AMD64
++  __asm__(".symver log2f,log2f@GLIBC_2.2.5");
++#endif
++
+ #ifndef PRODUCT
+ extern int explicit_null_checks_inserted,
+            explicit_null_checks_elided;
+diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c
+index 3854f36..26cf41c 100644
+--- a/src/java.base/unix/native/libjava/ProcessImpl_md.c
++++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c
+@@ -48,6 +48,10 @@
+ 
+ #include "childproc.h"
+ 
++#if defined(amd64)
++  __asm__(".symver posix_spawn,posix_spawn@GLIBC_2.2.5");
++#endif
++
+ /*
+  *
+  * When starting a child on Unix, we need to do three things:
+-- 
+1.8.3.1
+

downgrade-the-glibc-symver-of-memcpy.patch

@@ -0,0 +1,96 @@
+From 2e5e3cc58933e166cba5a3f0e3c59d0ca3849196 Mon Sep 17 00:00:00 2001
+From: zhangyipeng <zhangyipeng7@huawei.com>
+Date: Thu, 24 Mar 2022 11:12:46 +0800
+Subject: [PATCH] [Huawei] downgrade the glibc symver of memcpy
+
+Signed-off-by: Sun Jianye <sunjianye@huawei.com>
+---
+ make/common/NativeCompilation.gmk                    |  9 +++++++++
+ make/hotspot/lib/CompileJvm.gmk                      |  8 ++++++++
+ src/hotspot/share/runtime/memcpy.cpp                 | 20 ++++++++++++++++++++
+ .../linux/native/applauncher/LinuxPackage.c          |  3 +++
+ 4 files changed, 40 insertions(+)
+ create mode 100644 src/hotspot/share/runtime/memcpy.cpp
+
+diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
+index 1e2b170..4f22e2d 100644
+--- a/make/common/NativeCompilation.gmk
++++ b/make/common/NativeCompilation.gmk
+@@ -1102,6 +1102,15 @@ define SetupNativeCompilationBody
+       endif
+     endif
+ 
++    # if ldflags contain --wrap=memcpy, add memcpy.o to OBJS
++    ifneq ($$(findstring wrap=memcpy, $$($1_LDFLAGS)$$($1_EXTRA_LDFLAGS)),)
++      ifeq ($$(findstring memcpy$(OBJ_SUFFIX), $$($1_ALL_OBJS)),)
++        $$($1_BUILD_INFO):
++	    $(ECHO) 'Adding $(SUPPORT_OUTPUTDIR)/memcpy/memcpy$(OBJ_SUFFIX) to $1_ALL_OBJS'
++        $1_ALL_OBJS += $(SUPPORT_OUTPUTDIR)/memcpy/memcpy$(OBJ_SUFFIX)
++      endif
++    endif
++
+     $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
+         $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \
+         $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \
+diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
+index 65edd04..d5b689e 100644
+--- a/make/hotspot/lib/CompileJvm.gmk
++++ b/make/hotspot/lib/CompileJvm.gmk
+@@ -167,6 +167,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
+     PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
+ ))
+ 
++MEMCPY_OBJECT_FILE := $(JVM_OUTPUTDIR)/objs/memcpy$(OBJ_SUFFIX)
++
++$(eval $(call SetupCopyFiles, COPY_MEMCPY_OBJECT_FILE, \
++          DEST := $(SUPPORT_OUTPUTDIR)/memcpy, \
++          FILES :=$(MEMCPY_OBJECT_FILE), \
++))
++TARGETS += $(COPY_MEMCPY_OBJECT_FILE)
++
+ # Always recompile abstract_vm_version.cpp if libjvm needs to be relinked. This ensures
+ # that the internal vm version is updated as it relies on __DATE__ and __TIME__
+ # macros.
+diff --git a/src/hotspot/share/runtime/memcpy.cpp b/src/hotspot/share/runtime/memcpy.cpp
+new file mode 100644
+index 0000000..6ab4ddb
+--- /dev/null
++++ b/src/hotspot/share/runtime/memcpy.cpp
+@@ -0,0 +1,20 @@
++/*
++ * Copyright (c) Huawei Technologies Co., Ltd. 2018-2021. All rights reserved.
++ */
++
++#if defined( __GNUC__ ) && \
++(__GNUC__ >= 5  ||  (__GNUC__ == 4  &&  __GNUC_MINOR__ >= 7))
++#include <string.h>
++
++#if (defined AMD64) || (defined amd64)
++/* some systems do not have newest memcpy@@GLIBC_2.14 - stay with old good one */
++asm (".symver memcpy, memcpy@GLIBC_2.2.5");
++
++extern "C"{
++  void *__wrap_memcpy(void *dest, const void *src, size_t n)
++  {
++    return memcpy(dest, src, n);
++  }
++}
++#endif
++#endif
+diff --git a/src/jdk.jpackage/linux/native/applauncher/LinuxPackage.c b/src/jdk.jpackage/linux/native/applauncher/LinuxPackage.c
+index 5e3ef36..55a7e9c 100644
+--- a/src/jdk.jpackage/linux/native/applauncher/LinuxPackage.c
++++ b/src/jdk.jpackage/linux/native/applauncher/LinuxPackage.c
+@@ -33,6 +33,9 @@
+ #include "JvmLauncher.h"
+ #include "LinuxPackage.h"
+ 
++#if (defined AMD64) || (defined amd64)
++__asm__(".symver memcpy, memcpy@GLIBC_2.2.5");
++#endif
+ 
+ static char* getModulePath(void) {
+     char modulePath[PATH_MAX] = { 0 };
+-- 
+1.8.3.1
+

openjdk-latest.spec

@@ -176,7 +176,7 @@
 %global top_level_dir_name   %{origin}
 %global minorver        0
 %global buildver        9
-%global rpmrelease      1
+%global rpmrelease      2
 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -967,6 +967,9 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
 #
 #############################################
 
+# 17.0.2
+Patch7: downgrade-the-glibc-symver-of-memcpy.patch
+Patch8: downgrade-the-glibc-symver-of-log2f-posix_spawn.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -1193,6 +1196,8 @@ pushd %{top_level_dir_name}
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 popd # openjdk
 
 %patch1000
@@ -1744,6 +1749,9 @@ cjc.mainProgram(arg)
 
 
 %changelog
+* Tue Mar 29 2022 eapen <zhangyipeng7@huawei.com> - 1:17.0.2.9-2.rolling
+- Downgrade symbols to provide compalibility to lower glibc
+
 * Tue Mar 29 2022 eapen <zhangyipeng7@huawei.com> - 1:17.0.2.9-1.rolling
 - add openjdk-latest.yaml