2024-01-05 15:51:14 +08:00
|
|
|
From 9b51dcde590d8e93dfcd92ee6e37d19f72ce9138 Mon Sep 17 00:00:00 2001
|
|
|
|
|
Subject: add downgrade-the-glibc-symver-of-log2f-posix_spawn
|
2023-12-25 10:27:18 +08:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
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
|
2024-01-05 15:51:14 +08:00
|
|
|
index bb21f48f6..072e07706 100644
|
2023-12-25 10:27:18 +08:00
|
|
|
--- 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
|
2024-01-05 15:51:14 +08:00
|
|
|
index 9ed0ed309..64671d975 100644
|
2023-12-25 10:27:18 +08:00
|
|
|
--- 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:
|
|
|
|
|
--
|
2024-01-05 15:51:14 +08:00
|
|
|
2.19.1
|
2023-12-25 10:27:18 +08:00
|
|
|
|