From: Vladimir Petko <vladimir.petko@canonical.com>
Date: Mon, 9 Sep 2024 13:29:08 +0000 (+0200)
Subject: remove declaration of _Copy_conjoint_bytes
X-Git-Tag: archive/raspbian/21.0.5_6ea-1+rpi1^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9f052e943dfef65e4921682f6573ed0dcf15ae20;p=openjdk-21.git

remove declaration of _Copy_conjoint_bytes

Bug: https://bugs.openjdk.org/browse/JDK-8329983
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/collectd/+bug/2058966
Last-Update: 2024-04-10

JDK-8142362 removed implementation of _Copy_conjoint_bytes
but left the symbol declaration in for armhf.
This causes link failure against libjvm.so.

Gbp-Pq: Name jdk-8329983.patch
---

diff --git a/src/hotspot/os_cpu/linux_arm/linux_arm_32.S b/src/hotspot/os_cpu/linux_arm/linux_arm_32.S
index eb560d8f0..cfac173b1 100644
--- a/src/hotspot/os_cpu/linux_arm/linux_arm_32.S
+++ b/src/hotspot/os_cpu/linux_arm/linux_arm_32.S
@@ -28,8 +28,6 @@
 	# point or use it in the same manner as does the server
 	# compiler.
 
-        .globl _Copy_conjoint_bytes
-	.type _Copy_conjoint_bytes, %function
         .globl _Copy_arrayof_conjoint_bytes
 	.type _Copy_arrayof_conjoint_bytes, %function
 	.globl _Copy_disjoint_words